[Monotone-commits-diffs] net.venge.monotone: 5793584e8a4ba73408b1adbec5ae5283ddcea194

[code]

revision:            5793584e8a4ba73408b1adbec5ae5283ddcea194
date:                2011-01-17T13:09:16
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone
changelog:
We actually want merge to *not* canonicalize line endings.

manifest:
format_version "1"

new_manifest [00f66e858d1a28b6a9ee3ad37b5b918d235ddead]

old_revision [ad8415d4859e655f0a81ae9e78e47854cb408667]

patch "tests/automate_file_merge/__driver__.lua"
 from [15a2032d1312df8460a20bcbcfb54d995a02ad49]
   to [e4bb5f09511a07fefb63f6f76e2fd5238ba9e4b9]
============================================================
--- tests/automate_file_merge/__driver__.lua	15a2032d1312df8460a20bcbcfb54d995a02ad49
+++ tests/automate_file_merge/__driver__.lua	e4bb5f09511a07fefb63f6f76e2fd5238ba9e4b9
@@ -32,7 +32,7 @@ check(mtn("automate", "file_merge", firs
 
 writefile("expected_baz", "baz\r\nAAA\r\nbbb\r\nCCC")
 check(mtn("automate", "file_merge", first, "baz", second, "baz"), 0, true, nil)
-canonicalize("stdout")
+--canonicalize("stdout")
 check(samefile("expected_baz", "stdout"))
 
 -- end of file