doc/ja/hgmerge.1.ja.txt
author Colin McMillen <mcmillen@cs.cmu.edu>
Thu, 27 Apr 2006 22:11:13 -0700
changeset 2148 c72e618c1204
parent 1499 874efc57e00a
child 2858 345bac2bc4ec
permissions -rw-r--r--
Add MOTD display to hgweb and hgwebdir. The hgweb "footer" template now has space for an optional message of the day (MOTD). This is used in two contexts: 1) On the hgwebdir index page 2) On various pages of each individual repo For both cases, the MOTD is read out of an entry named "motd" in the [web] section of a config file -- the only difference is which file is used. For #1, you need to add the section to hgweb.config; for #2, you need to add to the repo's .hgrc file. I suggest something like this: [web] motd = <p>To download these repositories, <a href="http://www.selenic.com/mercurial">get Mercurial</a> and then type something like:</p><p><pre>hg clone http://gs3080.sp.cs.cmu.edu/hg.cgi/cpmpy</pre></p>You can also click the Download links to get an archive of the latest revision. An online sample is available here: http://gs3080.sp.cs.cmu.edu/hg.cgi
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
認められます。