title: Is there a way to make Git mark a file as conflicted?
body: <p>It's possible to commit files that contains conflict data. Is there a way to mark these files as conflicted again, so that running git mergetool will generate the necessary files and run the merge tool?</p>