We keep the different stages of a conflict in the index now
[stgit] / t / Makefile
2006-05-02 Yann DirsonAdd a testsuite framework copied from git-core