diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:22 +0900 |
| commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
| tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /notes-merge.c | |
| parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
| parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) | |
| download | git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.gz | |
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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 744c685576..b04d2f2131 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -624,7 +624,7 @@ int notes_merge(struct notes_merge_options *o, if (!oidcmp(&remote->object.oid, base_oid)) { /* Already merged; result == local commit */ if (o->verbosity >= 2) - printf("Already up-to-date!\n"); + printf("Already up to date!\n"); oidcpy(result_oid, &local->object.oid); goto found_result; } |