[Monotone-commits-nodiffs] Revision e3f24d942d75f9e7f26fe0fe28e56d86d5be0bc3

[monotone]

-----------------------------------------------------------------
Revision: e3f24d942d75f9e7f26fe0fe28e56d86d5be0bc3
Ancestor: e81541ab929d3fbc5af0240966066387f7cb5c0a
Ancestor: f912077852473f431a451da7d2e4b2402dabe442
Author: Thomas Moschny <address@hidden>
Date: 2009-01-07T10:50:25
Branch: net.venge.monotone

Modified files:
        NEWS cmd_conflicts.cc database.cc gettext.h monotone.cc
        options_list.hh po/de.po

ChangeLog: 

merge of 'e81541ab929d3fbc5af0240966066387f7cb5c0a'
     and 'f912077852473f431a451da7d2e4b2402dabe442'


monotone --db={your.database} diff 
--revision=e81541ab929d3fbc5af0240966066387f7cb5c0a 
--revision=e3f24d942d75f9e7f26fe0fe28e56d86d5be0bc3
monotone --db={your.database} diff 
--revision=f912077852473f431a451da7d2e4b2402dabe442 
--revision=e3f24d942d75f9e7f26fe0fe28e56d86d5be0bc3
----------------------------------------------------------------------