diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
| commit | 11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch) | |
| tree | d502d6143db9bbb16ca8afac629ff1b4126c9482 /git.txt | |
| parent | d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff) | |
| download | git-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz | |
Autogenerated HTML docs for v2.39.1-388-g2fc9e
Diffstat (limited to 'git.txt')
| -rw-r--r-- | git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -613,7 +613,7 @@ The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the -temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits. +temporary file -- it is removed when `GIT_EXTERNAL_DIFF` exits. + For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>. |