mergetools / gvimdiff2on commit Merge branch 'mg/work-tree-tests' (56d4e7e)
   1. "$MERGE_TOOLS_DIR/vimdiff"