projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 387c9d4) | patch
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 17:49:56 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:41:44 +0000 (19:41 -0700)
commitb541248467fa47979a34e3f1c5bbe3308fbdc4d1
treeaf1b1accf5962ebb10b7422e5ec6479e78b31b66tree | snapshot
parent387c9d49815ef4b1cefda71cf27f199d9fb24083commit | diff
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>
Documentation/config.txt diff | blob | history
builtin-merge-file.c diff | blob | history
t/t6023-merge-file.sh diff | blob | history
xdiff-interface.c diff | blob | history
xdiff-interface.h diff | blob | history
Git—the stupid content tracker