Re: [PATCH] merge-tree: fix typo in "both changed identically"

2013-04-27 Thread John Keeping
On Sat, Apr 27, 2013 at 03:23:18PM +0200, René Scharfe wrote: > How about squashing in this test? > > René > > --- > t/t4300-merge-tree.sh | 13 + > 1 file changed, 13 insertions(+) > > diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh > index bd43b3d..2defb42 100755 > ---

Re: [PATCH] merge-tree: fix typo in "both changed identically"

2013-04-27 Thread René Scharfe
How about squashing in this test? René --- t/t4300-merge-tree.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index bd43b3d..2defb42 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -205,6 +205,19 @@ EXPECTED

[PATCH] merge-tree: fix typo in "both changed identically"

2013-04-27 Thread John Keeping
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 empty instead of checking that both the "our" and "their" versions are empty. Fix this. Reported-by: Ren