[Monotone-commits-diffs] Revision 1268e7c41c2d0244f884f35d1e94a2444b571fe4

[monotone]

-----------------------------------------------------------------
Revision: 1268e7c41c2d0244f884f35d1e94a2444b571fe4
Ancestor: 4ab1bffdedca844feac5c67d48afaf2b71cded42
Ancestor: 636caf205d0d9ade959c0959fc7d30fdda70c955
Author: Timothy Brownawell  <address@hidden>
Date: 2006-06-15T00:29:11
Branch: net.venge.monotone.lua-testsuite

Modified files:
        .mtn-ignore ChangeLog cmd_merging.cc std_hooks.lua tester.cc
        tester.lua tests/automate_stdio/__driver__.lua
        tests/common/netsync.lua

ChangeLog: 

merge of 4ab1bffdedca844feac5c67d48afaf2b71cded42
     and 636caf205d0d9ade959c0959fc7d30fdda70c955


monotone --db={your.database} diff 
--revision=4ab1bffdedca844feac5c67d48afaf2b71cded42 
--revision=1268e7c41c2d0244f884f35d1e94a2444b571fe4
monotone --db={your.database} diff 
--revision=636caf205d0d9ade959c0959fc7d30fdda70c955 
--revision=1268e7c41c2d0244f884f35d1e94a2444b571fe4
----------------------------------------------------------------------