[Monotone-commits-nodiffs] Revision f6e078288f63ebb0ccc5bef3a56b07f1e221feb6

[monotone]

-----------------------------------------------------------------
Revision: f6e078288f63ebb0ccc5bef3a56b07f1e221feb6
Ancestor: 413c178a5f0c196d2e528c0470d2e376fc58dda3
Ancestor: 4cfddd9ab167af5158e2fc9765e592952c344a3e
Author: address@hidden
Date: 2007-02-15T20:12:31
Branch: net.venge.monotone
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Added files:
        asciik.cc asciik.hh
Modified files:
        HACKING Makefile.am charset.cc cmd_diff_log.cc configure.ac
        contrib/monotone-notify-hookversion.lua monotone.texi
        options_list.hh po/de.po po/it.po po/sv.po rev_height.cc
        rev_height.hh std_hooks.lua tests/import/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right

ChangeLog: 

explicit merge of '4cfddd9ab167af5158e2fc9765e592952c344a3e'
              and '413c178a5f0c196d2e528c0470d2e376fc58dda3'


monotone --db={your.database} diff 
--revision=413c178a5f0c196d2e528c0470d2e376fc58dda3 
--revision=f6e078288f63ebb0ccc5bef3a56b07f1e221feb6
monotone --db={your.database} diff 
--revision=4cfddd9ab167af5158e2fc9765e592952c344a3e 
--revision=f6e078288f63ebb0ccc5bef3a56b07f1e221feb6
----------------------------------------------------------------------