diff hgmerge @ 3102:36b08cd92fb7

merge: add codes to action list, eliminate None elements
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:24:00 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff