| commit | 482bd22d4985d605e7778c0e9ee21c65891f2b55 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Aug 2013 17:08:23 +0000 (30 10:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Aug 2013 17:08:23 +0000 (30 10:08 -0700) | ||
| tree | 4936e140567b33abf97b8021f3877701ea33aae9 | treesnapshot (tar.gz zip) |
| parent | 04d0eb89e3e3a5ff5a3b656a35f7c4b9a5608b16 | commitdiff |
| parent | 67ed84f3e25db8e81dd905dbe275bbcd37afb543 | commitdiff |
Merge branch 'rt/doc-merge-file-diff3'
* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"
* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"