[Monotone-commits-diffs] Revision ad6d4a7e114ce4315eed55b0fd2d7845919b075e

[monotone]

-----------------------------------------------------------------
Revision: ad6d4a7e114ce4315eed55b0fd2d7845919b075e
Ancestor: 4c0a91d8d4dff25ccf52de071fd5af2f10465ab2
Ancestor: baecfc8a0d1ad81c8c65bdc8f6ebf6d631baa5c0
Author: address@hidden
Date: 2006-06-13T05:04:14
Branch: net.venge.monotone

Modified files:
        ChangeLog cmd_merging.cc database.cc po/it.po po/sv.po
        std_hooks.lua visualc/sqlite3.vcproj

ChangeLog: 

merge of 4c0a91d8d4dff25ccf52de071fd5af2f10465ab2
     and baecfc8a0d1ad81c8c65bdc8f6ebf6d631baa5c0


monotone --db={your.database} diff 
--revision=4c0a91d8d4dff25ccf52de071fd5af2f10465ab2 
--revision=ad6d4a7e114ce4315eed55b0fd2d7845919b075e
monotone --db={your.database} diff 
--revision=baecfc8a0d1ad81c8c65bdc8f6ebf6d631baa5c0 
--revision=ad6d4a7e114ce4315eed55b0fd2d7845919b075e
----------------------------------------------------------------------