diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 17:49:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 02:41:44 (GMT) |
| commit | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch) | |
| tree | af1b1accf5962ebb10b7422e5ec6479e78b31b66 /mailmap.c | |
| parent | 387c9d49815ef4b1cefda71cf27f199d9fb24083 (diff) | |
| download | git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.zip git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.gz git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.bz2 | |
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 'mailmap.c')
0 files changed, 0 insertions, 0 deletions