diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-12 07:27:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 07:27:50 -0700 |
| commit | 87725757af66f3dd6c4141ebe3e410cb6f2e7210 (patch) | |
| tree | e265fdd5e61d7849b1204f4f44af18a6c91ccf2f /builtin/fmt-merge-msg.c | |
| parent | 68f532f4ba888f277637a94b4a49136054df0540 (diff) | |
| parent | 43bc2302706af6a3bb9266eea1bcb7071c54c8c6 (diff) | |
| download | git-87725757af66f3dd6c4141ebe3e410cb6f2e7210.tar.gz | |
Merge branch 'js/maint-fast-export-mark-error'
* js/maint-fast-export-mark-error:
fast-export: report SHA-1 instead of gibberish when marks exist already
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions