X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=fba4b0cb5fffbb1ad3f39c670c6364975c52186a;hb=48fd688ab0ba7d41ff4286aee20f6f0b86e4c41c;hp=5619409f1c7ee9c694c2de59aff195f971502226;hpb=1a17ee22a2fbd85a893ab36fd53168d03554c2dd;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 5619409f1..fba4b0cb5 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -8,7 +8,7 @@
 #   $2 - file in branch1 SHA1 (or empty)
 #   $3 - file in branch2 SHA1 (or empty)
 #   $4 - pathname in repository
-#   $5 - orignal file mode (or empty)
+#   $5 - original file mode (or empty)
 #   $6 - file in branch1 mode (or empty)
 #   $7 - file in branch2 mode (or empty)
 #