> In 79e73d6882ea68c70abd5891f47806eabe5d0f10 on 16 March ... > ... > This fixed a hang on Windows for me. > > Let me know if it fixes your problems.
It does. resolve_conflicts_dropped_modified_1 now passes successfully - tested with 5934509c86e975ce771c66a1511671620eceb6d0 (descendant of 79e...) several times. All tests pass now on SLED 11 SP2. Richard _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel
