diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:49:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:44 -0700 |
| commit | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch) | |
| tree | af1b1accf5962ebb10b7422e5ec6479e78b31b66 /diffcore-break.c | |
| parent | rerere: understand "diff3 -m" style conflicts with the original (diff) | |
| download | tgif-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.xz | |
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
This teaches "git merge-file" to honor merge.conflictstyle configuration
variable, whose value can be "merge" (default) or "diff3".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions