mergetools / gvimdiff3on commit Merge branch 'nd/switch-and-restore' (f496b06)
   1. "$MERGE_TOOLS_DIR/vimdiff"