mergetools / gvimdiff3on commit Merge branch 'nd/command-list-gen-fix' (ca6e972)
   1. "$MERGE_TOOLS_DIR/vimdiff"