On Thu, Feb 28, 2008 at 05:25:53PM +0000, [EMAIL PROTECTED] wrote: > Thu Feb 28 16:58:30 GMT 2008 Eric Kow <[EMAIL PROTECTED]> > * Avoid sleeping in conflict-doppleganger test. > Using record --ignore-times
We shouldn't need to add --ignore-times, because make test does that for us. > Thu Feb 28 17:24:24 GMT 2008 Eric Kow <[EMAIL PROTECTED]> > * Add a test for 'resolution' dopplegangers. > > Should identical resolutions of a conflict be treated as conflicting? They shouldn't be conflicting in darcs-2. Applied. Thanks! -- David Roundy Department of Physics Oregon State University _______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel