config.c: remove unnecessary header in minimum configuration file.
[git] / t / t6020-merge-df.sh
2005-12-03  Fredrik KuivinenNew test case: merge with directory/file conflicts