mergetools / gvimdiff2on commit pull: use merge-base --fork-point when appropriate (48059e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"