| commit | 1faac1cedca475a364c72b063c79da08caee0fe9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2015 20:46:44 +0000 (23 13:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:17:52 +0000 (29 13:17 -0700) | ||
| tree | be1bcfab97428d3a79ef106cc201b8f425709725 | treesnapshot (tar.gz zip) |
| parent | 7ad39a2784fd2d2ad6538e687404cf7f35a1e771 | commitdiff |
merge: clarify "pulling into void" special case
Instead of having it as one of the three if/elseif/.. case arms,
test the condition and handle this special case upfront. This makes
it easier to follow the flow of logic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Instead of having it as one of the three if/elseif/.. case arms,
test the condition and handle this special case upfront. This makes
it easier to follow the flow of logic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |