![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:11 +0000 (12:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:11 +0000 (12:08 -0700) |
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Trivial merge