Include modified files (but not staged) in merge conflicts