Re: [PATCH v2] merge-tree: don't print entries that match "local"

2013-04-27 Thread John Keeping
On Sat, Apr 27, 2013 at 01:35:57PM +0200, René Scharfe wrote: > Am 07.04.2013 23:07, schrieb John Keeping: > > The documentation says: > > > > the output from the command omits entries that match the > > tree. > > > > But currently "added in branch1" and "removed in branch1" (both while >

Re: [PATCH v2] merge-tree: don't print entries that match "local"

2013-04-27 Thread René Scharfe
Am 07.04.2013 23:07, schrieb John Keeping: The documentation says: the output from the command omits entries that match the tree. But currently "added in branch1" and "removed in branch1" (both while unchanged in branch2) do print output. Change this so that the behaviour matc

[PATCH v2] merge-tree: don't print entries that match "local"

2013-04-07 Thread John Keeping
The documentation says: the output from the command omits entries that match the 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 K