| commit | 3efc61add5c5656f0d74cde2b0ff07dd6acb6784 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 10 Apr 2016 06:13:35 +0000 (9 23:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 01:23:23 +0000 (12 18:23 -0700) | ||
| tree | 470ddbf1a07d3bf42afb3c7ae3375d6aad7fe8d5 | treesnapshot (tar.gz zip) |
| parent | 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 | commitdiff |
merge-recursive: remove duplicate code
In commit 51931bf (merge-recursive: Improve handling of rename
target vs. directory addition, 2011-08-11), I apparently added two
lines of code that were immediately duplicated a few lines later.
No idea why, other than it seems pretty clear this was a mistake:
there is no need to remove the same file twice; removing it once is
sufficient...especially since the intervening line was working with
a different file entirely.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In commit 51931bf (merge-recursive: Improve handling of rename
target vs. directory addition, 2011-08-11), I apparently added two
lines of code that were immediately duplicated a few lines later.
No idea why, other than it seems pretty clear this was a mistake:
there is no need to remove the same file twice; removing it once is
sufficient...especially since the intervening line was working with
a different file entirely.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |