mergetools / gvimdiff3on commit Merge branch 'ta/config-add-to-empty-or-true-fix' (4daf5c8)
   1. "$MERGE_TOOLS_DIR/vimdiff"