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

removing b
nothing changed