[Monotone-commits-nodiffs] Revision d683820c6c3ab1293698058791b3da9e9318090e

[monotone]

-----------------------------------------------------------------
Revision: d683820c6c3ab1293698058791b3da9e9318090e
Ancestor: 08ec66686a0de0e2e665bfc1e30c3b3ec174c6b3
Author: address@hidden
Date: 2007-09-23T13:18:02
Branch: net.venge.monotone

Deleted entries:
        contrib/diff3_keep_conflicts_merger.lua

ChangeLog: 

remove contrib/diff3_keep_conflicts_merger.lua; functionality now in 
std_hooks.lua
##
##
##
##


monotone --db={your.database} diff 
--revision=08ec66686a0de0e2e665bfc1e30c3b3ec174c6b3 
--revision=d683820c6c3ab1293698058791b3da9e9318090e
----------------------------------------------------------------------