We keep the different stages of a conflict in the index now
[stgit] / t / t0001-subdir-branches.sh
CommitLineData