From: Andrew Kreimer <algonell@gmail.com>
Date: Wed, 2 Oct 2024 22:38:14 +0000 (+0300)
Subject: mergetool: fix a typo
X-Git-Tag: v2.47.0~9^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c1070c75869fd658a6aab066c380044b5c1a5ca;p=thirdparty%2Fgit.git

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

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