mergetools / gvimdiff2on commit Merge branch 'jk/error-const-return' (393b7c3)
   1. "$MERGE_TOOLS_DIR/vimdiff"