diff mercurial/merge.py @ 2851:b4f05ecf4ee8

Switch to simpler manifestdict
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Aug 2006 22:38:56 -0500
parents b11c014dcbd9
children 3d6efcbbd1c9 06c05c675a35
line wrap: on
line diff