[Monotone-commits-nodiffs] Revision 3927077002a64e0c826af31bf44dfe37fe409ec4

[monotone]

-----------------------------------------------------------------
Revision: 3927077002a64e0c826af31bf44dfe37fe409ec4
Ancestor: 7438f4d302f9bed11d1a5b3aa9e86de3d601f307
Author: Timothy Brownawell  <address@hidden>
Date: 07/01/10 05:28:04
Branch: net.venge.monotone.options

Modified files:
        cmd_merging.cc merge_conflict.cc options_list.hh

ChangeLog: 

Make --resolve-conflicts and --resolve-conflicts-file separate options instead 
of mutually exclusive.


monotone --db={your.database} diff 
--revision=7438f4d302f9bed11d1a5b3aa9e86de3d601f307 
--revision=3927077002a64e0c826af31bf44dfe37fe409ec4
----------------------------------------------------------------------