Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/ja/hgmerge.1.ja.txt @ 1985:c577689006fa
Adapted behaviour of ui.username() to documentation and mention it explicitly:
Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
and stop searching if one of these is set.
Abort if found username is an empty string to force specifying
the commit user elsewhere, e.g. with line option or repo hgrc.
If not found, use $LOGNAME or $USERNAME +"@full.hostname".
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 21 Mar 2006 15:33:29 +0100 |
parents | 874efc57e00a |
children | 345bac2bc4ec |
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 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
6 名前 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
7 -- |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
8 hgmerge - Mercurial ソースコード管理システムでファイルをマージする |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
9 のに使われるデフォルトのラッパー |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
10 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
11 書式 |
1489
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 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
15 説明 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
16 -- |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
17 hgmerge(1) コマンドは Mercurial システムでファイルをマージするため |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
18 のグラフィカルなインターフェイスを提供します。これは kdiff3, |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
19 merge(1), tkdiff(1), または単純に diff(1) と patch(1) のラッパーで、 |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
20 どれがシステム上にあるかに依存します。 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
21 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
22 hgmerge(1) は Mercurial ソースコード管理システムで環境変数 |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
23 HGMERGE が設定されていない場合に使われます。 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
24 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
25 著者 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
26 -- |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
27 Vincent Danjean <Vincent.Danjean@free.fr> によって書かれました。 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
28 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
29 関連情報 |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
30 -- |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
31 hg(1) - Mercurial システムへのコマンドラインインターフェイス |
1489
a64fdaf60f9d
Added Japanese translations of manpages.
"Hidetaka Iwai <tyuyu@debian.or.jp>"
parents:
diff
changeset
|
32 |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
33 著作権情報 |
1489
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. |
1499
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
36 このソフトウェアの自由な使用は GNU 一般公有使用許諾 (GPL) のもとで |
874efc57e00a
Fixed wrong encoding of files.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
1489
diff
changeset
|
37 認められます。 |