K 10
svn:author
V 5
peter
K 8
svn:date
V 27
2018-10-08T08:44:01.254000Z
K 7
svn:log
V 303
Pull upstream r1839662

"Don't scan for moves for 'local missing' conflicts unless a YCA is known.

Prevent the resolver from embarking on an endless search in case of
a 'incoming edit vs. local missing' conflict where no YCA can be
found which would cap our search through history."

Requested by:	des

END