[Monotone-commits-diffs] Revision 60c435fb1ffe48eefba4d5c937a1d92fe26158c9

[monotone]

-----------------------------------------------------------------
Revision: 60c435fb1ffe48eefba4d5c937a1d92fe26158c9
Ancestor: a49064dfd9face7387efb663a13646187be18931
Ancestor: f6e078288f63ebb0ccc5bef3a56b07f1e221feb6
Author: address@hidden
Date: 2007-02-15T20:28:28
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Modified files:
        HACKING cmd_ws_commit.cc configure.ac
        contrib/monotone-notify-hookversion.lua monotone.texi
        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: 

merge of 'a49064dfd9face7387efb663a13646187be18931'
     and 'f6e078288f63ebb0ccc5bef3a56b07f1e221feb6'


monotone --db={your.database} diff 
--revision=a49064dfd9face7387efb663a13646187be18931 
--revision=60c435fb1ffe48eefba4d5c937a1d92fe26158c9
monotone --db={your.database} diff 
--revision=f6e078288f63ebb0ccc5bef3a56b07f1e221feb6 
--revision=60c435fb1ffe48eefba4d5c937a1d92fe26158c9
----------------------------------------------------------------------