comparison doc/hgmerge.1.txt @ 1220:8baa29e36b14

import: fix bug in mail-format detection
author mpm@selenic.com
date Thu, 08 Sep 2005 12:10:43 -0700
parents c084cfbb2389
children 3ab6e55ee361
comparison
equal deleted inserted replaced
1219:56582bb2b869 1220:8baa29e36b14