-----------------------------------------------------------------
Revision: b173b86b5764159ecddb767345e7bf474fcc3e3e
Ancestor: 349cba3a5a942dd832dc376249a05f0994bb8387
Ancestor: 6ae0f55bd126d9eca9e740b20d40d8e3d1090d85
Author: [email protected]
Date: 2009-05-09T17:38:48
Branch: net.venge.monotone
Modified files:
NEWS cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
selectors.cc
tests/mtn_execute_attr_respects_umask/__driver__.lua
tests/resolve_conflicts_content/update-1
tests/resolve_conflicts_none/update-1
tests/update_loses_execute/__driver__.lua unix/process.cc
work.cc work.hh
ChangeLog:
merge of '349cba3a5a942dd832dc376249a05f0994bb8387'
and '6ae0f55bd126d9eca9e740b20d40d8e3d1090d85'
monotone --db={your.database} diff
--revision=349cba3a5a942dd832dc376249a05f0994bb8387
--revision=b173b86b5764159ecddb767345e7bf474fcc3e3e
monotone --db={your.database} diff
--revision=6ae0f55bd126d9eca9e740b20d40d8e3d1090d85
--revision=b173b86b5764159ecddb767345e7bf474fcc3e3e
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
