| commit | e137a892d88cc40d7c0df45c06c08d144f7b3ce2 | |
| author | Matt McCutchen <matt@mattmccutchen.net> | |
| Sun, 19 Oct 2008 00:40:50 +0000 (18 20:40 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 21:49:38 +0000 (19 14:49 -0700) | ||
| tree | b076d058ba329466edeef8295df9e4ce4956c726 | treesnapshot (tar.gz zip) |
| parent | 971e83528d8c545a4453e7b5cd6dc37fd0e9ebcc | commitdiff |
git-merge-recursive: honor merge.conflictstyle once again
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>
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>
| merge-recursive.c | diffblobblamehistory |