aboutsummaryrefslogtreecommitdiff
path: root/t/t3901-utf8.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 21:15:27 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-21 21:15:27 -0700
commitd836118be990867be3a4d3ce932f58d761e5e612 (patch)
tree5d8d0f02e79fec24bf034d1660c81f70e4423512 /t/t3901-utf8.txt
parent6019b3ce8d178ed99d37b32cc2c523c25f0d58a1 (diff)
parentc8c562a238071843c64ea0f3a2c85481606da379 (diff)
downloadgit-d836118be990867be3a4d3ce932f58d761e5e612.tar.gz
git-d836118be990867be3a4d3ce932f58d761e5e612.tar.xz
Merge branch 'cb/maint-no-double-merge' into maint
* cb/maint-no-double-merge: refuse to merge during a merge
Diffstat (limited to 't/t3901-utf8.txt')
0 files changed, 0 insertions, 0 deletions