comparison doc/hgmerge.1.txt @ 1481:acd1832ebf31

Change test-hook to test multiple hooks
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Oct 2005 13:45:01 -0700
parents 3ab6e55ee361
children 345bac2bc4ec
comparison
equal deleted inserted replaced
1480:ae0d8d632b83 1481:acd1832ebf31