Merge branch 'rt/doc-merge-file-diff3'
* rt/doc-merge-file-diff3: Documentation/git-merge-file: document option "--diff3"
Junio C Hamano committed
Aug 30, 2013 at 10:08 UTC
482bd22d4985d605e7778c0e9ee21c65891f2b55
No changes.