merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git] / t / t2015-checkout-unborn.sh
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Sync with 1.6.4.2
2009-08-29 Merge branch 'mm/reset-report'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-25 checkout: do not imply "-f" on unborn branches