diff doc/ja/hgmerge.1.ja.txt @ 3255:f05c182430a0

merge: add rename following Currently disabled by default, enable with [merge] followcopies = 1
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 15:43:27 -0500
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff