[Monotone-commits-diffs] Revision eff7f90c64935f420e78981a29f28abb1c02bb05

[monotone]

-----------------------------------------------------------------
Revision: eff7f90c64935f420e78981a29f28abb1c02bb05
Ancestor: 400cc3060df10b16c6b733dbb26622aa535714e8
Ancestor: 9bf0114cb7a6606e7981c38723cc916b19319140
Author: address@hidden
Date: 2006-07-06T05:51:11
Branch: net.venge.monotone.cherrypatch

Added files:
        tests/merge_conflict_with_no_lca/__driver__.lua
        tests/merge_conflict_with_no_lca/rcfile
Added directories:
        tests/merge_conflict_with_no_lca
Modified files:
        ChangeLog cmd_merging.cc commands.cc diff_patch.cc
        monotone.cc randomfile.hh tester.lua
        tests/checking_a_few_command_specific_options/__driver__.lua
        tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua
        testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
9bf0114cb7a6606e7981c38723cc916b19319140)
            to branch 'net.venge.monotone.cherrypatch' (head 
400cc3060df10b16c6b733dbb26622aa535714e8)


monotone --db={your.database} diff 
--revision=400cc3060df10b16c6b733dbb26622aa535714e8 
--revision=eff7f90c64935f420e78981a29f28abb1c02bb05
monotone --db={your.database} diff 
--revision=9bf0114cb7a6606e7981c38723cc916b19319140 
--revision=eff7f90c64935f420e78981a29f28abb1c02bb05
----------------------------------------------------------------------