mergetools / gvimdiff3on commit Merge branch 'nd/dir-prep-exclude-cleanup' (1758d23)
   1. "$MERGE_TOOLS_DIR/vimdiff"