rerere: fix for merge.conflictstyle
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 30 Apr 2014 04:08:29 +0000 (23:08 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Apr 2014 17:30:02 +0000 (10:30 -0700)
commitde3d8bb...736cafae0ff10e047e2afa994b1dd901
tree50e0126...9e64906fd9909829d32732d30da767d7copy hash to clipboard (tree)
parent7bbc4e8...db33e0a8e42e77cc05460d4c4f615f4dcopy hash to clipboard (diff)
builtin/rerere.c