diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
| commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
| tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /git-merge-octopus.sh | |
| parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
| parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) | |
| download | git-8e36002adda45a35c6fc4daf81913c3d2102cb59.zip git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.gz git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.bz2 | |
Merge branch 'ma/up-to-date'
Message and doc updates.
* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 6c390d6..7d19d37 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -74,7 +74,7 @@ do case "$LF$common$LF" in *"$LF$SHA1$LF"*) - eval_gettextln "Already up-to-date with \$pretty_name" + eval_gettextln "Already up to date with \$pretty_name" continue ;; esac |