diff options
| author | Andrew Kreimer <algonell@gmail.com> | 2024-10-03 01:38:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-03 12:06:51 -0700 |
| commit | 2c1070c75869fd658a6aab066c380044b5c1a5ca (patch) | |
| tree | 7009ad188d556840d378cb7372035b3522b879b9 /mergetools/vimdiff | |
| parent | a54601c38b2ca24ae5a2f15906618fc61e24be78 (diff) | |
| download | git-2c1070c75869fd658a6aab066c380044b5c1a5ca.tar.gz | |
mergetool: fix a typo
Fix a typo in comments.
Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
| -rw-r--r-- | mergetools/vimdiff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index f8ad6b35d4..ffc9be86c8 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -411,7 +411,7 @@ merge_cmd () { -f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"' else # If there is no BASE (example: a merge conflict in a new file - # with the same name created in both braches which didn't exist + # with the same name created in both branches which didn't exist # before), close all BASE windows using vim's "quit" command FINAL_CMD=$(echo "$FINAL_CMD" | \ |