diff doc/ja/hgmerge.1.ja.txt @ 4149:e59286f15189

Use "f in dirstate" instead of "dirstate.state(f) == '?'"
author Emanuele Aina <faina.mail@tiscali.it>
date Tue, 06 Mar 2007 17:45:43 -0300
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff