-----------------------------------------------------------------
Revision: 8fb30824944061ec4330c5d70449e7699f02b583
Ancestor: f7c3947c0a88b50dd439f15e34a7024b7c5f8303
Author: [email protected]
Date: 2010-05-23 00.37.37
Branch: net.venge.monotone.experiment.database-management

Modified files:
        cmd_ws_commit.cc

ChangeLog: 

* cmd_ws_commit.cc: merge fixup - my manual conflict resolution was wrong


monotone --db={your.database} diff 
--revision=f7c3947c0a88b50dd439f15e34a7024b7c5f8303 
--revision=8fb30824944061ec4330c5d70449e7699f02b583
----------------------------------------------------------------------

_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs

Reply via email to