diff doc/ja/hgmerge.1.ja.txt @ 3154:15d585dcdd1c

context: change filectx repr to use @ Avoids confusion with rev:nodeid syntax used elsewhere
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Sep 2006 16:43:21 -0500
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff