summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Nicolas Sebrecht <nicolas.s.dev@gmx.fr>2010-07-09 22:27:49 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-09 16:28:46 -0700
commit5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c (patch)
treea03be2dafc7ddb401e066349f57e908aac402271 /git-gui
parentGit 1.7.2-rc2 (diff)
downloadtgif-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 'git-gui')
0 files changed, 0 insertions, 0 deletions