diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-30 14:22:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-30 14:22:54 -0800 |
| commit | a6214fe06eefded4f71012043f35ad805e7dd19c (patch) | |
| tree | 311df639cdab8a30abcab49ef540387c97bfe200 /git-merge-ours.sh | |
| parent | t7003-filter-branch: Fix test of a failing --msg-filter. (diff) | |
| parent | cvsimport: miscellaneous packed-ref fixes (diff) | |
| download | tgif-a6214fe06eefded4f71012043f35ad805e7dd19c.tar.xz | |
Merge branch 'jk/maint-cvsimport-fix' into maint
* jk/maint-cvsimport-fix:
cvsimport: miscellaneous packed-ref fixes
cvsimport: use rev-parse to support packed refs
Add basic cvsimport tests
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions