Integrate RĂ¼diger Sonderfeld's code for detecting conflicted files under git.