annotate tests/test-merge4.out @ 986:2810c625ca98

Add web:style option
author mpm@selenic.com
date Sun, 21 Aug 2005 15:00:02 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source