annotate tests/test-merge4.out @ 1014:e37cd99fa909

Clean up argument passing for dodiff
author mpm@selenic.com
date Tue, 23 Aug 2005 18:58:26 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source