diff mercurial/merge.py @ 3648: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 3109f012c305
children eb0b4a2d70a9
line wrap: on
line diff