Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/ja/hgmerge.1.ja.txt @ 1489:a64fdaf60f9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Japanese translations of manpages.
author "Hidetaka Iwai <tyuyu@debian.or.jp>"
date Wed, 02 Nov 2005 16:13:24 -0800
parents
children 874efc57e00a
comparison
equal deleted inserted replaced
1488:08c7851969cc 1489:a64fdaf60f9d
1 HGMERGE(1)
2 ==========
3 Matt Mackall <mpm@selenic.com>
4 v0.1, 27 May 2005
5
6 ??????
7 --
8 hgmerge - Mercurial ?????????????????????????????????????????????????????????????????????
9 ????????????????????????????????????????????????
10
11 ??????
12 --
13 'hgmerge' local ancestor remote
14
15 ??????
16 --
17 hgmerge(1) ??????????????? Mercurial ???????????????????????????????????????????????????
18 ?????????????????????????????????????????????????????????????????????????????? kdiff3,
19 merge(1), tkdiff(1), ?????????????????? diff(1) ??? patch(1) ?????????????????????
20 ?????????????????????????????????????????????????????????
21
22 hgmerge(1) ??? Mercurial ???????????????????????????????????????????????????
23 HGMERGE ??????????????????????????????????????????????????????
24
25 ??????
26 --
27 Vincent Danjean <Vincent.Danjean@free.fr> ?????????????????????????????????
28
29 ????????????
30 --
31 hg(1) - Mercurial ???????????????????????????????????????????????????????????????
32
33 ???????????????
34 ----
35 Copyright (C) 2005 Matt Mackall.
36 ????????????????????????????????????????????? GNU ???????????????????????? (GPL) ????????????
37 ?????????????????????