equal
deleted
inserted
replaced
7246 "register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n" |
7246 "register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n" |
7247 "are run when changesets are received, while ``outgoing`` hooks are for\n" |
7247 "are run when changesets are received, while ``outgoing`` hooks are for\n" |
7248 "changesets sent to another repository::" |
7248 "changesets sent to another repository::" |
7249 msgstr "" |
7249 msgstr "" |
7250 ":hg:`help extensions` にならって、 本エクステンションを有効にした上で、\n" |
7250 ":hg:`help extensions` にならって、 本エクステンションを有効にした上で、\n" |
7251 "実行したいフックを登録してください。 `incoming`` および ``changegroup``\n" |
7251 "実行したいフックを登録してください。 ``incoming`` および ``changegroup``\n" |
7252 "フックは履歴の取り込みで、 ``outgoing`` は履歴の反映の際に実行されます::" |
7252 "フックは履歴の取り込みで、 ``outgoing`` は履歴の反映の際に実行されます::" |
7253 |
7253 |
7254 msgid "" |
7254 msgid "" |
7255 " [hooks]\n" |
7255 " [hooks]\n" |
7256 " # one email for each incoming changeset\n" |
7256 " # one email for each incoming changeset\n" |
9107 msgid " Example:" |
9107 msgid " Example:" |
9108 msgstr " 実行例:" |
9108 msgstr " 実行例:" |
9109 |
9109 |
9110 msgid "" |
9110 msgid "" |
9111 " - transplant all changes up to REV on top of your current revision::" |
9111 " - transplant all changes up to REV on top of your current revision::" |
9112 msgstr " - REV までの全リビジョンを、現リビジョン上に移植::" |
9112 msgstr " - REV までの全リビジョンを、現リビジョン上に移植::" |
9113 |
9113 |
9114 msgid " hg transplant --branch REV --all" |
9114 msgid " hg transplant --branch REV --all" |
9115 msgstr " hg transplant --branch REV --all" |
9115 msgstr " hg transplant --branch REV --all" |
9116 |
9116 |
9117 msgid "" |
9117 msgid "" |
9118 " You can optionally mark selected transplanted changesets as merge\n" |
9118 " You can optionally mark selected transplanted changesets as merge\n" |
9119 " changesets. You will not be prompted to transplant any ancestors\n" |
9119 " changesets. You will not be prompted to transplant any ancestors\n" |
9120 " of a merged transplant, and you can merge descendants of them\n" |
9120 " of a merged transplant, and you can merge descendants of them\n" |
13691 msgid "" |
13691 msgid "" |
13692 " - :hg:`resolve -l`: list files which had or still have conflicts.\n" |
13692 " - :hg:`resolve -l`: list files which had or still have conflicts.\n" |
13693 " In the printed list, ``U`` = unresolved and ``R`` = resolved." |
13693 " In the printed list, ``U`` = unresolved and ``R`` = resolved." |
13694 msgstr "" |
13694 msgstr "" |
13695 " - :hg:`resolve -l`: 衝突が検出されたファイルの解消状況を表示します。\n" |
13695 " - :hg:`resolve -l`: 衝突が検出されたファイルの解消状況を表示します。\n" |
13696 " 一覧表示において `U`` は未解消(Unresolved)を、\n" |
13696 " 一覧表示において ``U`` は未解消(Unresolved)を、\n" |
13697 " ``R`` は解消済み(Resolved)を意味します。" |
13697 " ``R`` は解消済み(Resolved)を意味します。" |
13698 |
13698 |
13699 msgid "" |
13699 msgid "" |
13700 " Note that Mercurial will not let you commit files with unresolved\n" |
13700 " Note that Mercurial will not let you commit files with unresolved\n" |
13701 " merge conflicts. You must use :hg:`resolve -m ...` before you can\n" |
13701 " merge conflicts. You must use :hg:`resolve -m ...` before you can\n" |