[Monotone-commits-diffs] Revision 4f98e6f12512a872c81c9c932ed6e0a48c8f64df

[monotone]

-----------------------------------------------------------------
Revision: 4f98e6f12512a872c81c9c932ed6e0a48c8f64df
Ancestor: a46bb47d1efda3bd9c05ae87cd1618743a6d1805
Ancestor: cb4c6ecb0bfc1c88ecb7cf5c5d8ab80ec03d3c33
Author: Timothy Brownawell  <address@hidden>
Date: 2009-08-29T19:59:55
Branch: net.venge.monotone

Added files:
        tests/resolve_conflicts_all_resolutions/show_first-gui_left
        tests/resolve_conflicts_all_resolutions/show_first-gui_right
        tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
        tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
Added directories:
        tests/resolve_conflicts_duplicate_name_directory
Modified files:
        NEWS cert.cc cert.hh cmd_conflicts.cc merge_conflict.cc
        merge_roster.cc merge_roster.hh monotone.texi netsync.cc
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/show_first-checkout_left
        tests/resolve_conflicts_all_resolutions/show_first-checkout_right
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_errors/__driver__.lua

ChangeLog: 

merge of 'a46bb47d1efda3bd9c05ae87cd1618743a6d1805'
     and 'cb4c6ecb0bfc1c88ecb7cf5c5d8ab80ec03d3c33'


monotone --db={your.database} diff 
--revision=a46bb47d1efda3bd9c05ae87cd1618743a6d1805 
--revision=4f98e6f12512a872c81c9c932ed6e0a48c8f64df
monotone --db={your.database} diff 
--revision=cb4c6ecb0bfc1c88ecb7cf5c5d8ab80ec03d3c33 
--revision=4f98e6f12512a872c81c9c932ed6e0a48c8f64df
----------------------------------------------------------------------