annotate doc/ja/hgmerge.1.ja.txt @ 1537:583b3696d24d

Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... (probably together with these other useful options: no-port-forwarding,no-X11-forwarding,no-agent-forwarding) This allows pull/push over ssh to to the repositories given as arguments. If all your repositories are subdirectories of a common directory, you can allow shorter paths with: command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 13 Nov 2005 02:06:02 +0100
parents 874efc57e00a
children 345bac2bc4ec
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 ----
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 認められます。