git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Kreimer <algonell@gmail.com>
To: git@vger.kernel.org
Cc: Andrew Kreimer <algonell@gmail.com>
Subject: [PATCH 3/5] mergetool: fix a typo
Date: Thu,  3 Oct 2024 01:38:14 +0300	[thread overview]
Message-ID: <20241002223816.14858-4-algonell@gmail.com> (raw)
In-Reply-To: <20241002223816.14858-1-algonell@gmail.com>

Fix a typo in comments.

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

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


  parent reply	other threads:[~2024-10-02 22:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-02 22:38 [PATCH 0/5] Fix typos Andrew Kreimer
2024-10-02 22:38 ` [PATCH 1/5] trace2: fix typos Andrew Kreimer
2024-10-02 22:38 ` [PATCH 2/5] reftable: fix a typo Andrew Kreimer
2024-10-02 22:38 ` Andrew Kreimer [this message]
2024-10-02 22:38 ` [PATCH 4/5] gitk: " Andrew Kreimer
2024-10-02 22:38 ` [PATCH 5/5] perl: " Andrew Kreimer
2024-10-02 22:49 ` [PATCH 0/5] Fix typos Eric Sunshine
2024-10-08 13:37   ` Andrew Kreimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241002223816.14858-4-algonell@gmail.com \
    --to=algonell@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).