diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:15:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:15:19 -0800 |
| commit | 94468bc1f719b7e0009ec0600b178dd5f412d702 (patch) | |
| tree | d575fed066ab542840be3ec793fb523491e16677 /fast-import.c | |
| parent | 9e8f6e7f6e8817db30a492e32fa92c1daf51b77c (diff) | |
| parent | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c (diff) | |
| download | git-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.gz git-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.xz | |
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions