diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 08:45:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 21:04:21 +0200 |
| commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
| tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/git-mergetool.txt | |
| parent | The fifteenth batch (diff) | |
| download | git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.xz git-cf6cac20059123d6ec3f867bb3692df62db52cf9.zip | |
documentation: wording improvements
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 07535f6576..800a3cbe6f 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -115,7 +115,7 @@ These are safe to remove once a file has been merged and its `git mergetool` session has completed. Setting the `mergetool.keepBackup` configuration variable to `false` -causes `git mergetool` to automatically remove the backup as files +causes `git mergetool` to automatically remove the backup files as files are successfully merged. BACKEND SPECIFIC HINTS |