status of "merge tracking"

What is the status of various things discussed in
http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt ?
Specifically, the "Ancestry-sensitive line-based-merge"

There are things in notes/ which speak in future-tense of what I thought
were already-implemented features, so I wonder how far along this
particular item is. It seems very useful and I seem to have run straight
into a slew of conflicts which it might resolve.

Of course, that's not to entirely exclude the other items on the list,
which I'm also curious about, this one was simply the most interesting
to me.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 11 22:51:56 2006