diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:11 -0700 |
| commit | a8b7fcffddc6bce0875775154d6a41a528340d71 (patch) | |
| tree | 7a351043d53ce60a3686cd61d035a099d0caca08 | |
| parent | c257bbb559732ae2be07064de7a583bc24436667 (diff) | |
| parent | 5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c (diff) | |
| download | git-a8b7fcffddc6bce0875775154d6a41a528340d71.tar.gz git-a8b7fcffddc6bce0875775154d6a41a528340d71.tar.xz | |
Merge branch 'ns/merge-recursive-uptodate'
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 856e98c08..fb6aa4a55 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o, } if (sha_eq(common->object.sha1, merge->object.sha1)) { - output(o, 0, "Already uptodate!"); + output(o, 0, "Already up-to-date!"); *result = head; return 1; } |