Previously, we only detected .abcmerge files as being indicators of a merge conflict. Now that we've implemented patch reversal for included-from-destination files, we also might have .rej files hanging around from a merge conflict.
Also: use .patch.rej instead of just .rej for rejected patch files. This makes it less likely that someone just happens to have a file with a coincidentally matching file extension
Also: add a unit test for detectUnmergedConflicts().
Previously, we only detected .abcmerge files as being indicators of a merge conflict. Now that we've implemented patch reversal for included-from-destination files, we also might have
.rejfiles hanging around from a merge conflict.Also: use
.patch.rejinstead of just.rejfor rejected patch files. This makes it less likely that someone just happens to have a file with a coincidentally matching file extensionAlso: add a unit test for detectUnmergedConflicts().