summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-10 08:08:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-10 08:08:22 (GMT)
commit8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch)
treee3640ac0242262814f2b2d4c2a01c4332faeb18c /Documentation/git-merge.txt
parenta48ce378585054f2ae3b2f0e18346ab005290524 (diff)
parent7560f547e614244fe1d4648598d4facf7ed33a56 (diff)
downloadgit-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 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 615e6ba..4df6431 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -141,7 +141,7 @@ exception is when the changed index entries are in the state that
would result from the merge already.)
If all named commits are already ancestors of `HEAD`, 'git merge'
-will exit early with the message "Already up-to-date."
+will exit early with the message "Already up to date."
FAST-FORWARD MERGE
------------------