diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:59:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:44 -0700 |
| commit | c236bcd06138bcbc929b86ad1a513635bf4847b2 (patch) | |
| tree | 4e1b02387bf93c73b7fc487aa417cb0ae1170d57 /Documentation/git-relink.txt | |
| parent | merge.conflictstyle: choose between "merge" and "diff3 -m" styles (diff) | |
| download | tgif-c236bcd06138bcbc929b86ad1a513635bf4847b2.tar.xz | |
git-merge-recursive: learn to honor merge.conflictstyle
This teaches the low-level ll_xdl_merge() routine to honor
merge.conflictstyle configuration variable, so that merge-recursive
strategy can show the conflicts in the style of user's choice.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-relink.txt')
0 files changed, 0 insertions, 0 deletions