summaryrefslogtreecommitdiff
path: root/contrib/svn-fe/.gitignore
diff options
context:
space:
mode:
authorLibravatar Ralf Thielow <ralf.thielow@gmail.com>2013-08-09 20:09:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-09 14:19:59 -0700
commit67ed84f3e25db8e81dd905dbe275bbcd37afb543 (patch)
tree54dfb7d45c5066bb8858f4155cab68f94712c6f9 /contrib/svn-fe/.gitignore
parentparse-options: fix clang opterror() -Wunused-value warning (diff)
downloadtgif-67ed84f3e25db8e81dd905dbe275bbcd37afb543.tar.xz
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>
Diffstat (limited to 'contrib/svn-fe/.gitignore')
0 files changed, 0 insertions, 0 deletions