diff doc/hg.1.txt @ 8733:f8be48c6b08c

merge: simplify flag merging code slightly
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 9d67706ee8d5
children b2059435f176
line wrap: on
line diff