Andrew's git / gitweb.git / diff
?
Merge branch 'rt/doc-merge-file-diff3'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"

Trivial merge