'status --reset' should remove the conflicts as well
[stgit] / doc /
2005-09-25 Catalin MarinasMinor typos in the tutorial
2005-09-23 Catalin MarinasAdd the tutorial back to the repository