mergetools / gvimdiff2on commit pull: add pull.ff configuration (b814da8)
   1. "$MERGE_TOOLS_DIR/vimdiff"