[Monotone-commits-diffs] Revision 755d4575b1b66781b44ded0923cdb2ca7bc23978

[monotone]

-----------------------------------------------------------------
Revision: 755d4575b1b66781b44ded0923cdb2ca7bc23978
Ancestor: 4edf0f0b338a68d7f03dbe645487f1758730d6d4
Author: address@hidden
Date: 2007-02-09T22:56:34
Branch: net.venge.monotone.workspace-merge.noconflict

Modified files:
        ChangeLog cmd_files.cc
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

        * cmd_files.cc (cat, automate get_file_of): Fail gracefully in a
        two-parent workspace, unless given -r.
        * tests/two_parent_workspace_commands_that_fail: Test them.

txt62FzVYwFqf.txt
Description: Diff [4edf0f0b338a68d7f03dbe645487f1758730d6d4] -> [755d4575b1b66781b44ded0923cdb2ca7bc23978]