[Monotone-commits-diffs] Revision 9c4a4ec5be257e4320ced76a0321760648b8e50c

[monotone]

-----------------------------------------------------------------
Revision: 9c4a4ec5be257e4320ced76a0321760648b8e50c
Ancestor: 57f949b1c893e4a786eae11a54af2e72d8b90002
Ancestor: fe91f21394e8c67a9d6c3d91d3f221e5809367cd
Author: Timothy Brownawell  <address@hidden>
Date: 1969-12-21T03:32:54
Branch: net.venge.monotone.error-handling

Added files:
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace
Modified files:
        cmd_db.cc cmd_merging.cc monotone.texi netxx_pipe.cc
        paths.cc tests/commit_validation_lua_hook/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua win32/fs.cc
        win32/ssh_agent_platform.cc win32/tester-plaf.cc

ChangeLog: 

merge of '57f949b1c893e4a786eae11a54af2e72d8b90002'
     and 'fe91f21394e8c67a9d6c3d91d3f221e5809367cd'


monotone --db={your.database} diff 
--revision=57f949b1c893e4a786eae11a54af2e72d8b90002 
--revision=9c4a4ec5be257e4320ced76a0321760648b8e50c
monotone --db={your.database} diff 
--revision=fe91f21394e8c67a9d6c3d91d3f221e5809367cd 
--revision=9c4a4ec5be257e4320ced76a0321760648b8e50c
----------------------------------------------------------------------