comparison doc/ja/hgmerge.1.ja.txt @ 3119:5644a05a608c

merge: simplify exec flag handling
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:38:02 -0500
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3118:7a635ef25132 3119:5644a05a608c