Have git rerere automatically mark files as resolved?
I'm using git rerere, and it is useful, but there is one problem: When it automatically resolves a file, it does not mark it as resolved (eg with git add). So if I run 'git mergetool', it opens up the file as if it still has all the conflicts in it. So far, I've made a small shell script which I can call, which scans all files marked a...