![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Aug 2008 17:49:56 +0000 (10:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:41:44 +0000 (19:41 -0700) | ||
| commit | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 | |
| tree | af1b1accf5962ebb10b7422e5ec6479e78b31b66 | tree | snapshot |
| parent | 387c9d49815ef4b1cefda71cf27f199d9fb24083 | commit | 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>
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>