[Monotone-commits-nodiffs] Revision 4e18659b6a0bb19aac19cd9e0d6124222f6e11ac

[monotone]

-----------------------------------------------------------------
Revision: 4e18659b6a0bb19aac19cd9e0d6124222f6e11ac
Ancestor: 05b9c6cfe418886e6281f5f25c13be7a2a159b71
Author: address@hidden
Date: 2008-02-17T06:25:07
Branch: net.venge.monotone

Modified files:
        monotone.texi

ChangeLog: 

        * monotone.texi (Merge Conflicts): new section describing the various
          conflict types and resolution strategies; plus fixes for a couple of
          small unrelated issues



monotone --db={your.database} diff 
--revision=05b9c6cfe418886e6281f5f25c13be7a2a159b71 
--revision=4e18659b6a0bb19aac19cd9e0d6124222f6e11ac
----------------------------------------------------------------------