comparison hgmerge @ 3785:6398ff7cb705

imported patch collision
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Dec 2006 17:10:31 -0600
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3784:1427949b8f80 3785:6398ff7cb705