diff mercurial/dirstate.py @ 3122:2ef0b3aae186

merge: simplify actions with helper function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:27:30 -0500
parents 882e703eaa94
children b1f10d3223c1
line wrap: on
line diff