From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Aug 2013 17:08:23 +0000 (-0700)
Subject: Merge branch 'rt/doc-merge-file-diff3'
X-Git-Tag: v1.8.5-rc0~203
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/482bd22d4985d605e7778c0e9ee21c65891f2b55

Merge branch 'rt/doc-merge-file-diff3'

* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"
---

482bd22d4985d605e7778c0e9ee21c65891f2b55