git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aacecc3)
merge-tree: fix typo in "both changed identically"
authorJohn Keeping <redacted>
Sat, 27 Apr 2013 13:40:33 +0000 (14:40 +0100)
committerJunio C Hamano <redacted>
Sun, 28 Apr 2013 18:53:41 +0000 (11:53 -0700)
commitab5f42422d7e025c3151d91cc5ec0d20b9a80922
tree4d5b34b530add1399b22f5bce0bdc87fd78bb7fatree | snapshot
parentaacecc3b36a6cd4d2707e3f1cbd7bb4122477c64commit | diff
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 <redacted>
Test-written-by: René Scharfe <redacted>
Signed-off-by: John Keeping <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge-tree.c diff | blob | history
t/t4300-merge-tree.sh diff | blob | history
git clone https://git.99rst.org/PROJECT