-----------------------------------------------------------------
Revision: 01c85ac4fa0d6223c06a91e3df20d0e9b283fe92
Ancestor: 05f14b9c8a98370118fd2b2585b07cbdc78e82f5
Ancestor: d9dfcb5c11aea69a7dbec68e39b651780188504e
Author: [email protected]
Date: 06/20/10 15:07:44
Branch: net.venge.monotone
Branch: net.venge.monotone.stephe
Modified files:
INSTALL merge_conflict.cc po/de.po
ChangeLog:
merge of '05f14b9c8a98370118fd2b2585b07cbdc78e82f5'
and 'd9dfcb5c11aea69a7dbec68e39b651780188504e'
monotone --db={your.database} diff
--revision=05f14b9c8a98370118fd2b2585b07cbdc78e82f5
--revision=01c85ac4fa0d6223c06a91e3df20d0e9b283fe92
monotone --db={your.database} diff
--revision=d9dfcb5c11aea69a7dbec68e39b651780188504e
--revision=01c85ac4fa0d6223c06a91e3df20d0e9b283fe92
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
