vimdiff teaming with Subversion and other merging queries

I seem to remember seeing a wrapper script somewhere that allowed one
to use vimdiff for the diff3-cmd in Subversion, but for the life of me
I can't find it. Do any of you know where I might find one?

Also, I was curious if any of you have found a particullary
streamlined way of dealing with conflicts? I am doing a live demo
tommorrow for my development team and some of them have been using
this hacked up script onto of RCS for more than a decade, so I really
need to wow them. I want to show that lock-modify-unlock is NOT the
way to go and the only thing that I fear in my demo is resolving the
conflicts.

Also related to merging, I am trying to find a good three-way merge
tool that has the bitkeeper/submerge layout (to original files
veritcally split above the merge file). I did like submerge when I
was able to get a working version, but I can't seem to get it to
compile now.

Thanks ahead of time!
Troy

-- 
"Beware of spyware. If you can, use the Firefox browser." - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org