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>
Andrew Kreimer committed
Oct 3, 2024 at 01:38 UTC
2c1070c75869fd658a6aab066c380044b5c1a5ca
1 file changed
+1
-1
mergetools/vimdiff
+1
-1
@@ -411,7 +411,7 @@ merge_cmd () {
411
-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
412
else
413
# If there is no BASE (example: a merge conflict in a new file
414
- # with the same name created in both braches which didn't exist
414
+ # with the same name created in both branches which didn't exist
415
# before), close all BASE windows using vim's "quit" command
416
417
FINAL_CMD=$(echo "$FINAL_CMD" | \