Hello
When pulling, I've been routinely using --external-merge, because a
kdiff3 is a much more pleasant way to resolve conflicts than digging
through conflict markers. However, darcs creates about four copies of
my source tree (version1, version2, ancestor, merged) for the pull,
whether there end up being conflicts or not, which is very slow. Is
there a way to make it only do this when there are actual conflicts? Or
alternatively, a way to use an external merge tool to resolve conflicts
after pull has put conflict markers in?
I suppose I could pull, then if there are conflicts, unpull and repull
with --external-merge, but the little voices in my head say there must
be a better way.
Edwin
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
