mergetools / gvimdiff3on commit Merge branch 'nd/warn-more-for-devs' (e998e7a)
   1. "$MERGE_TOOLS_DIR/vimdiff"