[Monotone-commits-nodiffs] Revision 2339517a87ad427124d44585c8c163a2cc172313

[monotone]

-----------------------------------------------------------------
Revision: 2339517a87ad427124d44585c8c163a2cc172313
Ancestor: 7160327541e5ef25b37068e8cebfcff674bcb887
Author: address@hidden
Date: 2006-05-02T02:57:40
Branch: net.venge.monotone

Modified files:
        ChangeLog cmd_merging.cc tests/t_update_off_branch.at ui.cc

ChangeLog: 

2006-05-01  Nathaniel Smith  <address@hidden>

        * cmd_merging.cc (update): Hopefully clarify messages in the
        different cases where target branch differs from current branch.
        * tests/t_update_off_branch.at: Test all paths.
        * ui.cc (warn): Use prefix_lines_with and mark "warning:" for
        translation.


monotone --db={your.database} diff 
--revision=7160327541e5ef25b37068e8cebfcff674bcb887 
--revision=2339517a87ad427124d44585c8c163a2cc172313
----------------------------------------------------------------------