mergetools / gvimdiff2on commit apply: make parse_git_diff_header public (ef283b3)
   1. "$MERGE_TOOLS_DIR/vimdiff"