-----------------------------------------------------------------
Revision: 6c12b62baa30a1abbe32e8d0463337b8a03eb8af
Ancestor: 201865bdf90c29bd7320f4b177aedf69e18a0b6c
Ancestor: 5a85d8e334f7b950a59419beb018e6d8ec7f06e1
Author: Timothy Brownawell <[email protected]>
Date: 2009-04-28T12:52:52
Branch: net.venge.monotone
Modified files:
automate.cc cmd_netsync.cc database.cc key_store.cc
key_store.hh keys.cc keys.hh merge_conflict.cc
merge_content.cc monotone.cc netsync.cc po/es.po project.cc
sanity.cc sanity.hh
tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
tests/spawn_redirected_hook_helper/__driver__.lua
tests/spawn_redirected_hook_helper/testhooks txt2c.cc ui.cc
ui.hh unit-tests/roster.cc unit_tester.cc vocab.cc vocab.hh
ChangeLog:
merge of '201865bdf90c29bd7320f4b177aedf69e18a0b6c'
and '5a85d8e334f7b950a59419beb018e6d8ec7f06e1'
monotone --db={your.database} diff
--revision=201865bdf90c29bd7320f4b177aedf69e18a0b6c
--revision=6c12b62baa30a1abbe32e8d0463337b8a03eb8af
monotone --db={your.database} diff
--revision=5a85d8e334f7b950a59419beb018e6d8ec7f06e1
--revision=6c12b62baa30a1abbe32e8d0463337b8a03eb8af
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
