tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 10 May 2006 10:31:54 -0700
changeset 2248 b914f0557832
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix diffs containing embedded "\r". add test to make sure fix stays fixed.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)