git-merge-recursive: honor merge.conflictstyle once again
authorMatt McCutchen <matt@mattmccutchen.net>
Sun, 19 Oct 2008 00:40:50 +0000 (20:40 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 21:49:38 +0000 (14:49 -0700)
commite137a89...d88cc40d7c0df45c06c08d144f7b3ce2
treeb076d05...ba329466edeef8295df9e4ce4956c726copy hash to clipboard (tree)
parent971e835...8d8c545a4453e7b5cd6dc37fd0e9ebcccopy hash to clipboard (diff)
merge-recursive.c