-----------------------------------------------------------------
Revision: 4c207a77d7e34dd6d796dab7b2e168cbdc5a7210
Ancestor: 9fcfbed0430dac807ab26186d0d2d125941b6895
Author: [email protected]
Date: 2009-08-24T01:11:30
Branch: net.venge.monotone

Modified files:
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_orphaned_file/__driver__.lua

ChangeLog: 

Fix typo, resolve_conflicts_orphaned_file on Windows 

* tests/resolve_conflicts_content/conflicts-2: fix typo

* tests/resolve_conflicts_orphaned_file/__driver__.lua: need canonicalize
  on Windows, even with \n in string literal.


monotone --db={your.database} diff 
--revision=9fcfbed0430dac807ab26186d0d2d125941b6895 
--revision=4c207a77d7e34dd6d796dab7b2e168cbdc5a7210
----------------------------------------------------------------------


_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs

Reply via email to