stgit.el: Fix problems with revert of unmerged files

Signed-off-by: Gustav Hållberg <gustav@gmail.com>
1 file changed