Backport conflict "fsfs automerge algorithm"
From: Max Bowsher <maxb_at_ukf.net>
Date: 2005-03-19 15:32:04 CET
* r13222, r13223, r13232
This change produces many conflicts.
Therefore, I'm not sure that any of the votes actually count, since we can't
Max.
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.