mergetools / vimdiff2on commit pull: allow pull to preserve merges when rebasing (66713ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"