[Monotone-commits-diffs] Revision e39df824c3a60efb3d7957bab97d7a2a435b8b52

[monotone]

-----------------------------------------------------------------
Revision: e39df824c3a60efb3d7957bab97d7a2a435b8b52
Ancestor: 2f7dfac41a274758a34c32917c833a175c191aaa
Author: address@hidden
Date: 2007-07-14T02:01:31
Branch: net.venge.monotone.lua_cmds

Modified files:
        cmd_merging.cc

ChangeLog: 

Modify both automate and non-automate versions of update so that they
share a function to do the work.  Modify the automate update function
so that it has reasonable output for automation.

txtPAGdN7sPtK.txt
Description: Diff [2f7dfac41a274758a34c32917c833a175c191aaa] -> [e39df824c3a60efb3d7957bab97d7a2a435b8b52]