diff doc/ja/hgmerge.1.ja.txt @ 3684:975c2469c316

correct remote heads test in prepush
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Nov 2006 16:32:36 -0600
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff