diff options
| author | Pavel Roskin <proski@gnu.org> | 2006-07-10 01:50:18 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-10 00:36:44 -0700 |
| commit | 82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (patch) | |
| tree | 9661cdf47ee3bf69192ff336e0514fc6dd607728 /git-merge-one-file.sh | |
| parent | 930cf7dd7cc6b87d173f182230763e1f1913d319 (diff) | |
| download | git-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.gz | |
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand
"--compability" anymore, but it does accept "--compatibility" instead,
which is already documented.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 5619409f1c..fba4b0cb5f 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) # |