comparison mercurial/merge.py @ 2823:1c6beafbae97

Use demandload @ syntax
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:18:16 -0500
parents 987c31e2a08c
children ca06d35af65e
comparison
equal deleted inserted replaced
2822:30f59f4a327e 2823:1c6beafbae97