diff mbox series

[3/5] mergetool: fix a typo

Message ID 20241002223816.14858-4-algonell@gmail.com (mailing list archive)
State Superseded
Commit 2c1070c75869fd658a6aab066c380044b5c1a5ca
Headers show
Series Fix typos | expand

Commit Message

Andrew Kreimer Oct. 2, 2024, 10:38 p.m. UTC 
Fix a typo in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 mergetools/vimdiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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" | \