merge-tree: don't print entries that match "local"
authorJohn Keeping <john@keeping.me.uk>
Sun, 7 Apr 2013 21:07:51 +0000 (22:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2013 17:50:52 +0000 (10:50 -0700)
The documentation says:

the output from the command omits entries that match the
<branch1> tree.

But currently "added in branch1" and "removed in branch1" (both while
unchanged in branch2) do print output. Change this so that the
behaviour matches the documentation.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found