annotate tests/test-merge4.out @ 1220:8baa29e36b14

import: fix bug in mail-format detection
author mpm@selenic.com
date Thu, 08 Sep 2005 12:10:43 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source