[darcs-devel] [issue1817] merge regression [status=waiting-for]
Eric Kow
kowey at darcs.net
Mon Apr 26 18:04:47 UTC 2010
On Sun, Apr 18, 2010 at 11:10:22 +0000, Dave Love wrote:
> With the current 2.4-ish source, when I get put into the external merge
> tool I seem invariably to get an empty `variant A' and a single marked
> conflict covering the whole of variant B. With Ubuntu's 2.3.0 I get a
> sensible result with a non-empty A and the expected small regions in
> which to resolve conflicts. I'm surprised it doesn't seem to have been
> reported already, or have I failed to find it in the bug tracker. I'm
> not sure how easily I can construct a simple test case, but I'll have a
> go if you need it.
Hmm, yes, if you could at least give us an informal recipe for
reproducing it, that would be a good start. A test case would
be even better.
Cheers,
--
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20100426/2b7c5bba/attachment.pgp>
More information about the darcs-devel
mailing list