| commit | ab5f42422d7e025c3151d91cc5ec0d20b9a80922 | |
| author | John Keeping <john@keeping.me.uk> | |
| Sat, 27 Apr 2013 13:40:33 +0000 (27 14:40 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 28 Apr 2013 18:53:41 +0000 (28 11:53 -0700) | ||
| tree | 4d5b34b530add1399b22f5bce0bdc87fd78bb7fa | treesnapshot (tar.gz zip) |
| parent | aacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 | commitdiff |
merge-tree: fix typo in "both changed identically"
Commit aacecc3 (merge-tree: don't print entries that match "local" -
2013-04-07) had a typo causing the "same in both" check to be incorrect
and check if both the base and "their" versions are removed instead of
checking that both the "our" and "their" versions are removed. Fix
this.
Reported-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Test-written-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit aacecc3 (merge-tree: don't print entries that match "local" -
2013-04-07) had a typo causing the "same in both" check to be incorrect
and check if both the base and "their" versions are removed instead of
checking that both the "our" and "their" versions are removed. Fix
this.
Reported-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Test-written-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-tree.c | diffblobblamehistory | |
| t/t4300-merge-tree.sh | diffblobblamehistory |