Mercurial > hg > mercurial-crew-with-dirclash

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1489
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
1 HGMERGE(1)
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
2 ==========
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
3 Matt Mackall <mpm@selenic.com>
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
4 v0.1, 27 May 2005
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
5
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
6 ??????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
7 --
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
8 hgmerge - Mercurial ?????????????????????????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
9 ????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
10
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
11 ??????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
12 --
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
13 'hgmerge' local ancestor remote
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
14
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
15 ??????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
16 --
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
17 hgmerge(1) ??????????????? Mercurial ???????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
18 ?????????????????????????????????????????????????????????????????????????????? kdiff3,
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
19 merge(1), tkdiff(1), ?????????????????? diff(1) ??? patch(1) ?????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
20 ?????????????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
21
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
22 hgmerge(1) ??? Mercurial ???????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
23 HGMERGE ??????????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
24
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
25 ??????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
26 --
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
27 Vincent Danjean <Vincent.Danjean@free.fr> ?????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
28
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
29 ????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
30 --
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
31 hg(1) - Mercurial ???????????????????????????????????????????????????????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
32
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
33 ???????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
34 ----
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
35 Copyright (C) 2005 Matt Mackall.
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
36 ????????????????????????????????????????????? GNU ???????????????????????? (GPL) ????????????
a64fdaf60f9d Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff changeset
37 ?????????????????????