diff mercurial/patch.py @ 6512:368a4ec603cc

merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents ac0bcd951c2c
children c2c4fa9af016
line wrap: on
line diff