mergetools / gvimdiff2on commit sequencer: remember the onelines when parsing the todo file (c22f7df)
   1. "$MERGE_TOOLS_DIR/vimdiff"