diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-30 16:52:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-30 16:52:17 -0700 |
| commit | 0241d05c0ebac641b26dfd1e430cb6d275c3acb7 (patch) | |
| tree | cbf70952cde4640662dd542b8d0fdaef607a6099 /git-merge-file.txt | |
| parent | 683a86135b5ed57740264f0d8f8e59dbd7305d47 (diff) | |
| download | git-htmldocs-0241d05c0ebac641b26dfd1e430cb6d275c3acb7.tar.gz | |
Autogenerated HTML docs for v1.8.4-21-g992c3
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index d7db2a373..d2fc12ec7 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] - <current-file> <base-file> <other-file> + [--[no-]diff3] <current-file> <base-file> <other-file> DESCRIPTION @@ -66,6 +66,9 @@ OPTIONS -q:: Quiet; do not warn about conflicts. +--diff3:: + Show conflicts in "diff3" style. + --ours:: --theirs:: --union:: |