diff options
| author | Matt McCutchen <matt@mattmccutchen.net> | 2008-10-19 00:40:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 21:49:38 (GMT) |
| commit | e137a892d88cc40d7c0df45c06c08d144f7b3ce2 (patch) | |
| tree | b076d058ba329466edeef8295df9e4ce4956c726 /builtin-checkout.c | |
| parent | 971e83528d8c545a4453e7b5cd6dc37fd0e9ebcc (diff) | |
| download | git-e137a892d88cc40d7c0df45c06c08d144f7b3ce2.zip git-e137a892d88cc40d7c0df45c06c08d144f7b3ce2.tar.gz git-e137a892d88cc40d7c0df45c06c08d144f7b3ce2.tar.bz2 | |
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>
Diffstat (limited to 'builtin-checkout.c')
0 files changed, 0 insertions, 0 deletions