diff options
| author |  Elijah Newren <newren@gmail.com> | 2016-04-09 23:13:35 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-12 18:23:23 -0700 |
| commit | 3efc61add5c5656f0d74cde2b0ff07dd6acb6784 (patch) | |
| tree | 470ddbf1a07d3bf42afb3c7ae3375d6aad7fe8d5 /t/t5540-http-push-webdav.sh | |
| parent | Third batch for post 2.8 cycle (diff) | |
| download | tgif-3efc61add5c5656f0d74cde2b0ff07dd6acb6784.tar.xz | |
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>
Diffstat (limited to 't/t5540-http-push-webdav.sh')
0 files changed, 0 insertions, 0 deletions