mergetools / gvimdiff3on commit pull: pass --allow-unrelated-histories to "git merge" (09c2cb8)
   1. "$MERGE_TOOLS_DIR/vimdiff"