Andrew's git / gitweb.git / diff
?
Merge branch 'fc/rerere-conflict-style'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
* fc/rerere-conflict-style:
rerere: fix for merge.conflictstyle

Trivial merge