diff options
| author |  Ralf Thielow <ralf.thielow@gmail.com> | 2013-08-09 20:09:32 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-09 14:19:59 -0700 |
| commit | 67ed84f3e25db8e81dd905dbe275bbcd37afb543 (patch) | |
| tree | 54dfb7d45c5066bb8858f4155cab68f94712c6f9 /bundle.h | |
| parent | parse-options: fix clang opterror() -Wunused-value warning (diff) | |
| download | tgif-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 'bundle.h')
0 files changed, 0 insertions, 0 deletions