[Monotone-commits-diffs] Revision 25c98a0758c205f4e5e3f3c278588aefec7c342f

[monotone]

-----------------------------------------------------------------
Revision: 25c98a0758c205f4e5e3f3c278588aefec7c342f
Ancestor: 562aea13e1078bde1319779bc7bbebea4b43094a
Ancestor: 5b5e64254e65192290c2407115467d56e7b8a6de
Author: address@hidden
Date: 2008-04-19T16:43:57
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/wrong_options_override_workspace_options/__driver__.lua
Added directories:
        tests/wrong_options_override_workspace_options
Modified files:
        NEWS cmd_merging.cc lua-testsuite.lua monotone.texi
        tests/automate_show_conflicts_defaults/__driver__.lua
        work.cc

ChangeLog: 

merge of '562aea13e1078bde1319779bc7bbebea4b43094a'
     and '5b5e64254e65192290c2407115467d56e7b8a6de'


monotone --db={your.database} diff 
--revision=562aea13e1078bde1319779bc7bbebea4b43094a 
--revision=25c98a0758c205f4e5e3f3c278588aefec7c342f
monotone --db={your.database} diff 
--revision=5b5e64254e65192290c2407115467d56e7b8a6de 
--revision=25c98a0758c205f4e5e3f3c278588aefec7c342f
----------------------------------------------------------------------