annotate tests/test-merge4.out @ 1016:836667830fee

Teach annotate about binary files
author mpm@selenic.com
date Tue, 23 Aug 2005 20:21:52 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source