Mercurial > hg > mercurial-crew-with-dirclash

diff doc/ja/hgmerge.1.ja.txt @ 1663:d529cdc0a3ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
return a non-zero exit code when a merge failed
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 30 Jan 2006 12:02:06 +1300
parents 874efc57e00a
children 345bac2bc4ec
line wrap: on
line diff