merge_content(): Check whether D/F conflicts are still present
[gitweb.git] / t / t4013 / diff.config_format.subjectprefix_DIFFERENT_PREFIX
2007-07-03 Merge branch 'maint'
2007-07-03 format-patch: Add format.subjectprefix config option