mergetools / vimdiff3on commit Sync with 2.0.4 (aa544bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"