On Wed, Dec 28, 2011 at 10:09 AM, Andreas Du Rietz <dur...@gmail.com> wrote: > I just completed my worst merge yet, or so I thought. We use SVN 1.4 (I > know, we should upgrade). The branch has been synched multiple times with > trunk so I used this approach:
Why don't you upgrade? I gotta tell you, if you're using an OS old enough that you can't build or install a more recent release on it, you probably have deeper troubles than this.
