diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:52 -0800 |
| commit | 6fe870f032e4a247cdcf2949bb24d103873ff597 (patch) | |
| tree | 520a2cdb3b4e07a2c4c7a03e88ca28cf55a74e0a /git-merge-resolve.sh | |
| parent | 378b2607f07bd2fa0eaa8648e7dc8db636708d74 (diff) | |
| parent | fef3a7cc5593d3951a5f95c92986fb9982c2cc86 (diff) | |
| download | git-6fe870f032e4a247cdcf2949bb24d103873ff597.tar.gz git-6fe870f032e4a247cdcf2949bb24d103873ff597.tar.xz | |
Merge branch 'js/maint-cvsexport'
* js/maint-cvsexport:
cvsexportcommit: be graceful when "cvs status" reorders the arguments
Conflicts:
t/t9200-git-cvsexportcommit.sh
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions