[Monotone-commits-nodiffs] Revision ef39de24eccef9b22490d48964acbfadedfc133f

[monotone]

-----------------------------------------------------------------
Revision: ef39de24eccef9b22490d48964acbfadedfc133f
Ancestor: 7d9cac63f719729d18f9d602ea741a7a62b0865c
Author: address@hidden
Date: 2007-09-06T12:10:53
Branch: net.venge.monotone

Added files:
        contrib/diff3_keep_conflicts_merger.lua
Modified files:
        std_hooks.lua tester.cc
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua

ChangeLog: 

add_file  contrib/diff3_keep_conflicts_merger.lua : just puts conflicts in 
file; useful with merge_into_workspace

patch     std_hooks.lua : Fix '\' in lisp strings in mergers.emacs
patch     tester.cc     : Fix invalid arg bug

patch     tests/checkout_validates_target_directory/__driver__.lua : partial 
skip on Windows
patch     tests/clone_validates_target_directory/__driver__.lua    : partial 
skip on Windows
patch     tests/spawn_redirected_hook_helper/__driver__.lua        : skip on 
Windows for now; needs more work


monotone --db={your.database} diff 
--revision=7d9cac63f719729d18f9d602ea741a7a62b0865c 
--revision=ef39de24eccef9b22490d48964acbfadedfc133f
----------------------------------------------------------------------