[Monotone-commits-diffs] Revision 3d1684d868a380d8b6666850f5478cf70ed824d9

[monotone]

-----------------------------------------------------------------
Revision: 3d1684d868a380d8b6666850f5478cf70ed824d9
Ancestor: 29bc7447b4f9d456e441eb63aebba966f0cd3ff1
Ancestor: 2e8be5ea2d0d27650a97377a598c6c96c2f83f88
Author: address@hidden
Date: 2006-03-31T14:20:11
Branch: net.venge.monotone

Modified files:
        ChangeLog contrib/monotone.el mtn.1 po/fr.po roster_merge.cc
        roster_merge.hh testsuite.at

ChangeLog: 

propagate from branch 'net.venge.monotone.roster-merge-tests' (head 
29bc7447b4f9d456e441eb63aebba966f0cd3ff1)
            to branch 'net.venge.monotone' (head 
2e8be5ea2d0d27650a97377a598c6c96c2f83f88)


monotone --db={your.database} diff 
--revision=29bc7447b4f9d456e441eb63aebba966f0cd3ff1 
--revision=3d1684d868a380d8b6666850f5478cf70ed824d9
monotone --db={your.database} diff 
--revision=2e8be5ea2d0d27650a97377a598c6c96c2f83f88 
--revision=3d1684d868a380d8b6666850f5478cf70ed824d9
----------------------------------------------------------------------