Andrew's git / gitweb.git / diff
?
git-merge-recursive: honor merge.conflictstyle once again
authorMatt McCutchen <matt@mattmccutchen.net>
Sun, 19 Oct 2008 00:40:50 +0000 (20:40 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 21:49:38 +0000 (14:49 -0700)
This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found