Mercurial > hg
view doc/ja/hgmerge.1.ja.txt @ 1489:a64fdaf60f9d
Added Japanese translations of manpages.
author | "Hidetaka Iwai <tyuyu@debian.or.jp>" |
---|---|
date | Wed, 02 Nov 2005 16:13:24 -0800 |
parents | |
children | 874efc57e00a |
line wrap: on
line source
HGMERGE(1) ========== Matt Mackall <mpm@selenic.com> v0.1, 27 May 2005 ?????? -- hgmerge - Mercurial ????????????????????????????????????????????????????????????????????? ???????????????????????????????????????????????? ?????? -- 'hgmerge' local ancestor remote ?????? -- hgmerge(1) ??????????????? Mercurial ??????????????????????????????????????????????????? ?????????????????????????????????????????????????????????????????????????????? kdiff3, merge(1), tkdiff(1), ?????????????????? diff(1) ??? patch(1) ????????????????????? ????????????????????????????????????????????????????????? hgmerge(1) ??? Mercurial ??????????????????????????????????????????????????? HGMERGE ?????????????????????????????????????????????????????? ?????? -- Vincent Danjean <Vincent.Danjean@free.fr> ????????????????????????????????? ???????????? -- hg(1) - Mercurial ??????????????????????????????????????????????????????????????? ??????????????? ---- Copyright (C) 2005 Matt Mackall. ????????????????????????????????????????????? GNU ???????????????????????? (GPL) ???????????? ?????????????????????