diff mercurial/merge.py @ 4916:5cbdea5735f4

doc: typo, -x bit
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Jul 2007 15:26:28 -0500
parents 931f901ab811
children 6fd953d5faea 60c54154ec4c
line wrap: on
line diff