Files
git/Documentation
Ralf Thielow 67ed84f3e2 Documentation/git-merge-file: document option "--diff3"
The option "--diff3" was added to "git merge-file" in e0af48e
(xdiff-merge: optionally show conflicts in "diff3 -m" style)
but it was never documented in "Documentation/git-merge-file.txt".
Add documentation for this option.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-09 14:19:59 -07:00
..
2013-02-14 10:29:01 -08:00
2012-06-19 11:35:19 -07:00
2013-04-12 12:00:52 -07:00
2013-02-05 16:13:32 -08:00
2011-09-06 11:42:12 -07:00
2013-04-12 12:00:52 -07:00
2013-04-21 18:40:15 -07:00
2013-03-25 14:00:29 -07:00
2013-04-12 12:00:52 -07:00
2013-07-22 11:21:34 -07:00
2013-06-09 13:45:32 -07:00
2013-02-07 14:42:16 -08:00
2013-04-26 15:28:39 -07:00