mergetools / gvimdiff2on commit pull: merge into unborn by fast-forwarding from empty tree (b4dc085)
   1. "$MERGE_TOOLS_DIR/vimdiff"