annotate tests/test-merge4.out @ 1042:23f9d71ab9ae

Fix a couple fencepost errors in hg log
author mpm@selenic.com
date Wed, 24 Aug 2005 19:16:45 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source