# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1263977355 -3600
# Node ID e2c24bb25b36be085150cb5c5e2e8becf3401897
# Parent  d6512b3e9ac0dc97166f4e5dfac86891069291df# Parent  0d8577e1f56b272698f07c0408f677b7072af661
Merge with crew-stable

diff -r d6512b3e9ac0 -r e2c24bb25b36 tests/test-patch-offset
--- a/tests/test-patch-offset	Tue Jan 19 22:45:09 2010 -0600
+++ b/tests/test-patch-offset	Wed Jan 20 09:49:15 2010 +0100
@@ -63,5 +63,5 @@
 
 echo % compare imported changes against reference file
 python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
-diff -u aref a
+diff aref a