mergetools / gvimdiff2on commit Merge branch 'jk/merge-tree-added-identically' (423ecb0)
   1. "$MERGE_TOOLS_DIR/vimdiff"