mergetools / vimdiff3on commit Merge branch 'bw/push-dry-run' (12cf113)
   1. "$MERGE_TOOLS_DIR/vimdiff"