<div><span class="gmail_quote">On 4/16/07, <b class="gmail_sendername">Lee Cantey</b> <<a href="mailto:lcantey@gmail.com">lcantey@gmail.com</a>> wrote:</span>
<blockquote class="gmail_quote" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid"><br>There are a number of tools out there that could be chosen, but I've<br>been loath to make that decision for others. We could pick one and
<br>and point to documentation for assistance in setting up others. I'd<br>like to hear which tool people are using in Windows.</blockquote>
<div> </div>
<div>For 3 way merges I use the windows version of KDiff3. However, Beyond Compare is comming out with a new version later this year that will do 3 way merges so I will be using Beyond Compare after that.</div>
<div> </div>
<div>-mark</div></div>