Merge branch 'ab/i18n-fixup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:40 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:40 +0000 (15:58 -0700)
commita75c352...d35144934e97f2660401e05b36ef8083
tree9856bd7...555f4479eefa88d5248eefccea5852f7copy hash to clipboard (tree)
parent0d405d7...f5ffb499b40dd3a95886ae5a1fc13b30copy hash to clipboard (diff)
parentc9ea118...75b1b8f8cc744e372576b4cf63594e0dcopy hash to clipboard (diff)
builtin/merge.c
t/t0001-init.sh
t/t4001-diff-rename.sh
t/t7060-wtstatus.sh
t/test-lib.sh