chiark / gitweb /
'status --reset' should remove the conflicts as well
[stgit] / AUTHORS
1 Catalin Marinas <catalin.marinas@gmail.com>
2         http://www.procode.org/about.html