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)
commitb541248...67fa47979a34e3f1c5bbe3308fbdc4d1
treeaf1b1ac...f5962ebb10b7422e5ec6479e78b31b66copy hash to clipboard (tree)
parent387c9d4...815ef4b1cefda71cf27f199d9fb24083copy hash to clipboard (diff)
Documentation/config.txt
builtin-merge-file.c
t/t6023-merge-file.sh
xdiff-interface.c
xdiff-interface.h