comparison hgmerge @ 3318:c5075ad5e3e9

merge: use contexts in checkunknown and forgetremoved
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:43:58 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3317:966632304dde 3318:c5075ad5e3e9