Add compat/setenv.c, use in git.c.
[gitweb.git] / t / t6020-merge-df.sh
2005-12-03 New test case: merge with directory/file conflicts