comparison doc/hgmerge.1.txt @ 3864:1a7794525c2b

Automatically build MANIFEST for make dist
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Dec 2006 19:16:38 -0600
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3863:1ef8ada4370f 3864:1a7794525c2b