Merge branch 'js/maint-cvsexport' into maint
commit274d9d329444705ba771e548352918699e6bb557
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:13:52 +0000 (8 02:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:13:52 +0000 (8 02:13 -0800)
tree84840a0fd3c48ff360478fac43f3f4369ad0c57f
parent925ca887b8ade2a5de6b50652008d0ee1fff3215
parentfef3a7cc5593d3951a5f95c92986fb9982c2cc86
Merge branch 'js/maint-cvsexport' into maint

* js/maint-cvsexport:
  cvsexportcommit: be graceful when "cvs status" reorders the arguments

Conflicts:

t/t9200-git-cvsexportcommit.sh
git-cvsexportcommit.perl
t/t9200-git-cvsexportcommit.sh