diff doc/hg.1.txt @ 3119:5644a05a608c

merge: simplify exec flag handling
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:38:02 -0500
parents b9dbbcf8a488
children c9cd63a6fce9
line wrap: on
line diff