Re: merge-one-file: use common as base, instead of emptiness.

Dear diary, on Thu, Nov 10, 2005 at 09:30:55PM CET, I got a letter
where Junio C Hamano [off-list ref] said that...

Petr Baudis [off-list ref] writes:

quoted

But obviously now the trouble is opposite, when the files are completely
unrelated, since now you likely get large conflicting areas interleaved
with some scarce common lines... And this might get to be a big PITA to
resolve as well.

Yeah, you can always count lines in $orig and $src2 after
two-file merge runs, and if it appears we do not have enough
common section just empty the $orig before running merge.

Reasonable solution, I like that. Let's say 50%, like for the renames
detection?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.