K 10
svn:author
V 3
des
K 8
svn:date
V 27
2018-08-30T14:06:28.570090Z
K 7
svn:log
V 338
Add patch from upstream commit r1839662, which fixes automatic conflict
resolution for files removed from the merge target when the merge source
and merge target have no proper common ancestor.  This is a depressingly
common scenario in the FreeBSD base tree.

Approved by:	maintainer (lev)
Obtained from:	https://svn.apache.org/r1839662

END