am --skip: revert changes introduced by failed 3way merge

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 8361e6e4e3d2d4829d3ce3c6f3ec4a2ac974e86e..333cf6ff91c59fd96b587257ad413268df9a1458 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -69,8 +69,7 @@ with custom merge tool commands and has the same value as `$MERGED`.
 --tool-help::
        Print a list of diff tools that may be used with `--tool`.
 
---symlinks::
---no-symlinks::
+--[no-]symlinks::
        'git difftool''s default behavior is create symlinks to the
        working tree when run in `--dir-diff` mode and the right-hand
        side of the comparison yields the same content as the file in
@@ -92,6 +91,15 @@ instead.  `--no-symlinks` is the default on Windows.
        the default diff tool will be read from the configured
        `diff.guitool` variable instead of `diff.tool`.
 
+--[no-]trust-exit-code::
+       'git-difftool' invokes a diff tool individually on each file.
+       Errors reported by the diff tool are ignored by default.
+       Use `--trust-exit-code` to make 'git-difftool' exit when an
+       invoked diff tool returns a non-zero exit code.
++
+'git-difftool' will forward the exit code of the invoked tool when
+'--trust-exit-code' is used.
+
 See linkgit:git-diff[1] for the full list of supported options.
 
 CONFIG VARIABLES
@@ -117,6 +125,11 @@ See the `--tool=<tool>` option above for more details.
 difftool.prompt::
        Prompt before each invocation of the diff tool.
 
+difftool.trustExitCode::
+       Exit difftool if the invoked diff tool returns a non-zero exit status.
++
+See the `--trust-exit-code` option above for more details.
+
 SEE ALSO
 --------
 linkgit:git-diff[1]::