[darcs-users] darcs-with-p4merge tutorial

Adam Megacz megacz at cs.berkeley.edu
Thu Nov 22 20:14:11 UTC 2007


I wrote this with MacOS users in mind, but it should apply to other
operating systems with only minimal changes:

  http://www.megacz.com/thoughts/advice/p4merge-darcs.html

This tutorial turned out to be a side effect of me trying to figure
out exactly how external merge tools interact with darcs' conflict
resolution representation.  I think I have it mostly figured out, but
if I got anything wrong, let me know.

  - a

-- 
PGP/GPG: 5C9F F366 C9CF 2145 E770  B1B8 EFB1 462D A146 C380



More information about the darcs-users mailing list