[darcs-users] Merging Concepts after getting Public Patches.
Jamie Webb
j at jmawebb.cjb.net
Mon Sep 27 12:39:25 UTC 2004
On Mon, Sep 27, 2004 at 11:38:32AM +0100, Ralph Corderoy wrote:
> diffing dir...
> We have conflicts in the following files:
> ./Repository.lhs
I had this conflict appear as well when pulling from darcs-stable to a
pristine local repo. Darcs ran my external-merge command, which showed
all three versions to be identical. Why did that happen?
-- Jamie Webb
More information about the darcs-users
mailing list