mergetools / gvimdiff2on commit Merge branch 'jk/prefix-filename' (a026bde)
   1. "$MERGE_TOOLS_DIR/vimdiff"