[Monotone-commits-diffs] Revision 6fa042f051f27168bfb2193c20c0f088daf1e6ee

[monotone]

-----------------------------------------------------------------
Revision: 6fa042f051f27168bfb2193c20c0f088daf1e6ee
Ancestor: 02e64fab3f5e507bb4a2185fef4f56c1a6bb2f18
Ancestor: 9a34461c9d2e8707e4060a47d00a2d2c63877f6e
Author: address@hidden
Date: 2007-11-08T17:33:48
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Modified files:
        cmd_merging.cc rcs_import.cc unix/main.cc win32/main.cc

ChangeLog: 

merge of '02e64fab3f5e507bb4a2185fef4f56c1a6bb2f18'
     and '9a34461c9d2e8707e4060a47d00a2d2c63877f6e'


monotone --db={your.database} diff 
--revision=02e64fab3f5e507bb4a2185fef4f56c1a6bb2f18 
--revision=6fa042f051f27168bfb2193c20c0f088daf1e6ee
monotone --db={your.database} diff 
--revision=9a34461c9d2e8707e4060a47d00a2d2c63877f6e 
--revision=6fa042f051f27168bfb2193c20c0f088daf1e6ee
----------------------------------------------------------------------