diff options
| author | Pavel Roskin <proski@gnu.org> | 2007-02-04 04:49:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-04 05:49:54 (GMT) |
| commit | 3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7 (patch) | |
| tree | 86fe6fa503b65e19b37dceb5b7613602267a9bb1 /git-merge-resolve.sh | |
| parent | 0f3908758947b2279f5d2d4a294653d76a62d468 (diff) | |
| download | git-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.zip git-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.gz git-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.bz2 | |
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 0a8ef21..75e1de4 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Junio C Hamano # -# Resolve two trees, using enhancd multi-base read-tree. +# Resolve two trees, using enhanced multi-base read-tree. # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= |