diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:00:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:00:03 -0700 |
| commit | ca4effd8bce5e0dfce7ce1425074475c8643b7f0 (patch) | |
| tree | 9a88d0bb4eb0d9c37debb66303225f5e7d780065 /mergetools/defaults | |
| parent | Git 1.7.10.4 (diff) | |
| parent | fast-export: report SHA-1 instead of gibberish when marks exist already (diff) | |
| download | tgif-ca4effd8bce5e0dfce7ce1425074475c8643b7f0.tar.xz | |
Merge branch 'js/maint-fast-export-mark-error' into maint
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions