diff doc/hgmerge.1.txt @ 3655:2801a3efc7c3

changeset templater: convert some unnecessary yields to returns
author Matt Mackall <mpm@selenic.com>
date Wed, 15 Nov 2006 15:51:58 -0600
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff