-----------------------------------------------------------------
Revision: 422ed22303039a9bca7b7f1156cdd979789fa812
Ancestor: 926350771026fa1d0bc70061361c79271e205844
Author: [email protected]
Date: 05/01/10 15:38:06
Branch: net.venge.monotone
Modified files:
monotone.texi
ChangeLog:
* monotone.texi (Conflicts): file resolutions are now named resolved_user_left,
even for single file conflicts
monotone --db={your.database} diff
--revision=926350771026fa1d0bc70061361c79271e205844
--revision=422ed22303039a9bca7b7f1156cdd979789fa812
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
