comparison hgmerge @ 3006:87a0332ab58b

merge: combine merge and get lists
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 18:06:17 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3005:c67920d78248 3006:87a0332ab58b