| commit | 5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c | |
| author | Nicolas Sebrecht <nicolas.s.dev@gmx.fr> | |
| Fri, 9 Jul 2010 20:27:49 +0000 (9 22:27 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Jul 2010 23:28:46 +0000 (9 16:28 -0700) | ||
| tree | a03be2dafc7ddb401e066349f57e908aac402271 | treesnapshot (tar.gz zip) |
| parent | 9918285fb10d81af9021dae99c5f4de88ded497c | commitdiff |
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |