Merge branch 'ab/i18n-fixup' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:27 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:27 +0000 (12:00 -0700)
commitdd4c0ce...08f4ea89375aefb5566d4bf9ec21db5c
tree1a1c178...a30292b22b8b6247074932108ac2e1a6copy hash to clipboard (tree)
parentb3c8931...a33fbded4a8c5d533ca8ddc6087e4c23copy hash to clipboard (diff)
parentc9ea118...75b1b8f8cc744e372576b4cf63594e0dcopy hash to clipboard (diff)
12 files changed:
builtin/clone.c
builtin/init-db.c
builtin/merge.c
t/t0001-init.sh
t/t2200-add-update.sh
t/t3200-branch.sh
t/t4001-diff-rename.sh
t/t4014-format-patch.sh
t/t7012-skip-worktree-writing.sh
t/t7060-wtstatus.sh
t/t7600-merge.sh
t/test-lib.sh