merge-one-file, was Re: [PATCH] merge-tree: sometimes, d/f conflict is not an issue
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 9, 2007, 15:06 UTC
- Message-ID
- <Pine.LNX.4.64.0707091604030.5546@racer.site>
- In-Reply-To
- <7v8x9q1x5t.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 8 Jul 2007, Junio C Hamano wrote:
> [PATCH] Fix merge-one-file for our-side-added/our-side-removed cases
FWIW I have a patch series in my local repo, which makes merge-one-file a builtin, and even avoids fork()+exec()ing the program when called from unpack_trees(). However, I never came around to understand all the corner cases, and therefore did not write tests for it. Therefore, I am not really sure if it works as intended. So I'd be very grateful if you could write tests while you are touching it anyway...
Ciao, Dscho