You then call “/path/to/mergetooltool.py conflicted.txt”: it parses “conflicted.txt”, recognizes the markers, and simply creates two separate files, one with each version. Then, it opens your favorite diff
GUI (I use meld, you can simply set yours at line 9 of the script), lets you resolve conflicts (the version you want to use should be left in the left pane, the one showing “
filename.local”), and when you close puts the merged version back at “conflicted.txt”.