diff mercurial/merge.py @ 2968:4cdb68d7eb92

patch queue: portability.notes
author Danek Duvall <danek.duvall@sun.com>
date Mon, 21 Aug 2006 14:13:27 -0700
parents 8743188f4d2e
children 545d33aa3f82
line wrap: on
line diff