Andrew's git / gitweb.git / diff
?
merge-file: add option to select union merge favor
authorBert Wesarg <bert.wesarg@googlemail.com>
Mon, 1 Mar 2010 21:46:28 +0000 (22:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 05:16:45 +0000 (21:16 -0800)
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found