-----------------------------------------------------------------
Revision: 5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
Ancestor: a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
Author: [email protected]
Date: 2009-01-05T16:56:02
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Modified files:
ui.cc
ChangeLog:
Conflict 1.
monotone --db={your.database} diff
--revision=a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
--revision=5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
