comparison hgmerge @ 3120:b1de36a4b4df

merge: simplify prompt code
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:43:06 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3119:5644a05a608c 3120:b1de36a4b4df