aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorNicolas Sebrecht <nicolas.s.dev@gmx.fr>2010-07-09 22:27:49 +0200
committerJunio C Hamano <gitster@pobox.com>2010-07-09 16:28:46 -0700
commit5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c (patch)
treea03be2dafc7ddb401e066349f57e908aac402271 /builtin.h
parent9918285fb10d81af9021dae99c5f4de88ded497c (diff)
downloadgit-5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c.tar.gz
git-5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c.tar.xz
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>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions