Re: [PATCH] merge-tree: fix same file added in subdir

2013-03-28 Thread John Keeping
On Wed, Mar 27, 2013 at 10:57:39PM +, John Keeping wrote: On Wed, Mar 27, 2013 at 03:42:40PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: When the same file is added with identical content at the top level, git-merge-tree prints added in both with the

Re: [PATCH] merge-tree: fix same file added in subdir

2013-03-27 Thread John Keeping
On Wed, Mar 27, 2013 at 03:42:40PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: When the same file is added with identical content at the top level, git-merge-tree prints added in both with the details. But if the file is added in an existing subdirectory,