Mercurial > hg > mercurial-crew-with-dirclash

annotate doc/ja/hgmerge.1.ja.txt @ 4258:47ba52121433

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add import --exact. When this option is set, import will apply the patch (which must be generated by export) to the parents specified in the patch, and check that the node produced by the patch matches the node ID in the patch.
author Brendan Cully <brendan@kublai.com>
date Thu, 22 Mar 2007 10:44:59 -0700
parents 345bac2bc4ec
children 63b9d2deed48
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
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 ----
2858
345bac2bc4ec update copyrights.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1499
diff changeset
35 Copyright (C) 2005, 2006 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 認められます。