t2800: Adapt to changes in git's conflict markers
[stgit] / t / t0001-subdir-branches.sh
CommitLineData