From: Jim Weirich <jim.weirich@...>
Date: 2009-09-05T00:38:57+09:00
Subject: [ruby-core:25362] Re: [Feature #2033] Move Core Development to  Git


On Sep 4, 2009, at 4:43 AM, Eric Hodel wrote:

> On the other hand, if I have a conflict in subversion or perforce I  
> get a very helpful interactive resolving tool that lets me  
> interactively merge conflicts or bring up my favorite editor for  
> involved conflicts.


FYI: I've configured git to uses the perforce merge tool.  I can send  
you the config necessary for this if you are interested.

-- 
-- Jim Weirich
-- jim.weirich@gmail.com