![[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) | ||
| commit | a8b7fcffddc6bce0875775154d6a41a528340d71 | |
| tree | 7a351043d53ce60a3686cd61d035a099d0caca08 | tree | snapshot |
| parent | c257bbb559732ae2be07064de7a583bc24436667 | commit | diff |
| parent | 5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c | commit | diff |
Merge branch 'ns/merge-recursive-uptodate'
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency