comparison tests/test-merge-local.out @ 7425:14ed6662af48

tests: disable test-convert-darcs properly for darcs 2 The x bit was disabled without notice in 8046f0a070a6
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 23 Nov 2008 20:16:29 +0100
parents 92ccccb55ba3
children a964ab624385
comparison
equal deleted inserted replaced
7424:05a3f2802b13 7425:14ed6662af48