[Monotone-commits-diffs] Revision b1e0915e74af1d5ddf58f17c4071e71e3e8b87ef

[monotone]

-----------------------------------------------------------------
Revision: b1e0915e74af1d5ddf58f17c4071e71e3e8b87ef
Ancestor: 8ed3d5d15294cab62e8eac741cf100b48df77dc2
Author: address@hidden
Date: 2007-05-19T21:56:02
Branch: net.venge.monotone.help-rewrite

Modified files:
        automate.cc

ChangeLog: 

* automate.cc: Fix merge problems.  Grr, this is where "merge into
  workspace" could be useful instead of feeding everything directly
  to the repository without a chance for a review.

txtBX0LorXFCT.txt
Description: Diff [8ed3d5d15294cab62e8eac741cf100b48df77dc2] -> [b1e0915e74af1d5ddf58f17c4071e71e3e8b87ef]