mergetools / gvimdiff3on commit Merge branch 'nd/init-restore-env' (b30adaa)
   1. "$MERGE_TOOLS_DIR/vimdiff"