[Monotone-commits-diffs] Revision 8fbfef3193a3ecde98e6d9b7b518b49be7eb2650

[monotone]

-----------------------------------------------------------------
Revision: 8fbfef3193a3ecde98e6d9b7b518b49be7eb2650
Ancestor: 06e0eab04dffcc06a45351a3a1478dcbf814980a
Ancestor: 74d0181554ffa54ba78e22ec2a4b1f57a42c6c60
Author: address@hidden
Date: 2007-02-09T08:39:02
Branch: net.venge.monotone

Modified files:
        ChangeLog cmd_merging.cc diff_patch.cc diff_patch.hh
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        work.cc

ChangeLog: 

merge of '06e0eab04dffcc06a45351a3a1478dcbf814980a'
     and '74d0181554ffa54ba78e22ec2a4b1f57a42c6c60'


monotone --db={your.database} diff 
--revision=06e0eab04dffcc06a45351a3a1478dcbf814980a 
--revision=8fbfef3193a3ecde98e6d9b7b518b49be7eb2650
monotone --db={your.database} diff 
--revision=74d0181554ffa54ba78e22ec2a4b1f57a42c6c60 
--revision=8fbfef3193a3ecde98e6d9b7b518b49be7eb2650
----------------------------------------------------------------------