diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /Documentation/git-merge.txt | |
parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 615e6bacde..4df6431c34 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 ------------------ |