mergetools / gvimdiff2on commit add -p: only bind search key if there's more than one hunk (88f6ffc)
   1. "$MERGE_TOOLS_DIR/vimdiff"