mergetools / gvimdiff2on commit add -p: fix counting empty context lines in edited patches (f4d35a6)
   1. "$MERGE_TOOLS_DIR/vimdiff"