[Monotone-commits-nodiffs] Revision 126b5c7e52994006a582a4c6258f42f7653e2c07

[monotone]

-----------------------------------------------------------------
Revision: 126b5c7e52994006a582a4c6258f42f7653e2c07
Ancestor: 677c6c964ab7c10e64b024f830a7ebba310af1a0
Ancestor: d683820c6c3ab1293698058791b3da9e9318090e
Author: Timothy Brownawell  <address@hidden>
Date: 2007-09-23T14:13:22
Branch: net.venge.monotone

Deleted entries:
        contrib/diff3_keep_conflicts_merger.lua
Modified files:
        cmd_automate.cc std_hooks.lua

ChangeLog: 

merge of '677c6c964ab7c10e64b024f830a7ebba310af1a0'
     and 'd683820c6c3ab1293698058791b3da9e9318090e'


monotone --db={your.database} diff 
--revision=677c6c964ab7c10e64b024f830a7ebba310af1a0 
--revision=126b5c7e52994006a582a4c6258f42f7653e2c07
monotone --db={your.database} diff 
--revision=d683820c6c3ab1293698058791b3da9e9318090e 
--revision=126b5c7e52994006a582a4c6258f42f7653e2c07
----------------------------------------------------------------------