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 f8ad6b35d4dbde267d3defcf5bcd78b92c779fab..ffc9be86c83da1f3e342a98b8dcb20de83469a44 100644 (file)
--- 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" | \