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 /builtin/merge.c | |
| parent | Merge branch 'ma/ts-cleanups' (diff) | |
| parent | treewide: correct several "up-to-date" to "up to date" (diff) | |
| download | tgif-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.xz | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7df3fe3927..3672e38974 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1359,7 +1359,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * If head can reach all the merge then we are up to date. * but first the most common case of merging one remote. */ - finish_up_to_date(_("Already up-to-date.")); + finish_up_to_date(_("Already up to date.")); goto done; } else if (fast_forward != FF_NO && !remoteheads->next && !common->next && @@ -1442,7 +1442,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } } if (up_to_date) { - finish_up_to_date(_("Already up-to-date. Yeeah!")); + finish_up_to_date(_("Already up to date. Yeeah!")); goto done; } } |