'status --reset' should remove the conflicts as well
[stgit] / setup.cfg
1 [install]
2 prefix: ~