[thg] TortoiseHgと組み合わせて使うマージツールの実行ファイルの指定はどのように行うのでしょうか?
240 views
Skip to first unread message
ohira
Mar 28, 2017, 11:04:00 PM3/28/17
to mercurial-ja
いつもお世話になっております。
おおひらです。
通常にインストールされているwinmergeuのexeの代わりに特殊なバージョンのwinmergeuを一時的に動作させるため
%USERPROFILE%\Mercurial.iniに設定を追加して起動するwinmergeを切り替えようとしました。
ところが、うまく切り替わらず通常にインストールされているいつものwinmergeuが起動してしまいます。
起動したいkeep-merge3対応のWinMerge
起動したいファイルのパス
C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
設定ファイル
C:\Users\ohira\Mercurial.ini
設定ファイルの関連する部分
[ui]
merge = winmergeu
[merge-tools]
winmergeu.args = /e /ub /fr /ar /wl /wm /dl base /dm other /dr local $base $other $local /o $output
winmergeu.executable = C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
hg config で設定状況を表示させるとうまくせっていできてるようにみえるのですが、実際動かしてみると
いつものwinmergeが起動します。
premerge=keep-merge3対応の要望
Yuya Nishihara
Mar 30, 2017, 12:05:28 PM3/30/17
to mercur...@googlegroups.com, ohira
On Tue, 28 Mar 2017 20:04:00 -0700 (PDT), ohira wrote:
> TortoiseHgと組み合わせて使うマージツールの実行ファイルの指定はどのように行うのでしょうか?
>
> 通常にインストールされているwinmergeuのexeの代わりに特殊なバージョンのwinmergeuを一時的に動作させるため
> %USERPROFILE%\Mercurial.iniに設定を追加して起動するwinmergeを切り替えようとしました。
> ところが、うまく切り替わらず通常にインストールされているいつものwinmergeuが起動してしまいます。
>
> 起動したいkeep-merge3対応のWinMerge
> https://github.com/sdottaka/winmerge-v2/releases/tag/2.14.0%2B-jp-131
>
> 起動したいファイルのパス
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
>
> 設定ファイル
> C:\Users\ohira\Mercurial.ini
>
> 設定ファイルの関連する部分
>
> [ui]
> merge = winmergeu
>
> [merge-tools]
> winmergeu.args = /e /ub /fr /ar /wl /wm /dl base /dm other /dr local $base
> $other $local /o $output
> winmergeu.executable =
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
>
> hg config で設定状況を表示させるとうまくせっていできてるようにみえるのですが、実際動かしてみると
> いつものwinmergeが起動します。
設定方法は Mercurial と基本的に同じはずです。とりあえず、 TortoiseHg と
> TortoiseHgと組み合わせて使うマージツールの実行ファイルの指定はどのように行うのでしょうか?
>
> 通常にインストールされているwinmergeuのexeの代わりに特殊なバージョンのwinmergeuを一時的に動作させるため
> %USERPROFILE%\Mercurial.iniに設定を追加して起動するwinmergeを切り替えようとしました。
> ところが、うまく切り替わらず通常にインストールされているいつものwinmergeuが起動してしまいます。
>
> 起動したいkeep-merge3対応のWinMerge
> https://github.com/sdottaka/winmerge-v2/releases/tag/2.14.0%2B-jp-131
>
> 起動したいファイルのパス
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
>
> 設定ファイル
> C:\Users\ohira\Mercurial.ini
>
> 設定ファイルの関連する部分
>
> [ui]
> merge = winmergeu
>
> [merge-tools]
> winmergeu.args = /e /ub /fr /ar /wl /wm /dl base /dm other /dr local $base
> $other $local /o $output
> winmergeu.executable =
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
>
> hg config で設定状況を表示させるとうまくせっていできてるようにみえるのですが、実際動かしてみると
> いつものwinmergeが起動します。
同じコマンドを --debug つきで実行してみると何か分かるかもしれません。
TortoiseHg は "hg merge" の他に "hg resolve" を叩いていると思います。
(Workbench の Console ウィンドウにコマンドが表示されます。)
ohira
Mar 30, 2017, 9:24:56 PM3/30/17
to mercurial-ja, shin....@gmail.com, yu...@tcha.org
回答ありがとうございます。
2017年3月31日金曜日 1時05分28秒 UTC+9 Yuya Nishihara:
おおひらです。
--debug を付けて実行したところ、自分が行ったMercurial.iniの設定が有効でないことが確認できました。
2017年3月31日金曜日 1時05分28秒 UTC+9 Yuya Nishihara:
> 起動したいファイルのパス
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
>
> [ui]
> merge = winmergeu
>
> [merge-tools]
> winmergeu.args = /e /ub /fr /ar /wl /wm /dl base /dm other /dr local $base
> $other $local /o $output
> winmergeu.executable =
> C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
設定方法は Mercurial と基本的に同じはずです。とりあえず、 TortoiseHg と
同じコマンドを --debug つきで実行してみると何か分かるかもしれません。
TortoiseHg は "hg merge" の他に "hg resolve" を叩いていると思います。
(Workbench の Console ウィンドウにコマンドが表示されます。)
--debug オプションを追加して実行したところ、通常インストールのwinmergeが使われていることが確認できました。
winmergeのバージョン表示(動かしたいwinmergeは 131)
このファイルを参考にMercurial.iniを編集しました
C:\Program Files\TortoiseHg\hgrc.d\Paths.rc
[merge-tools]kdiff3.executable=C:\Program Files\TortoiseHg\lib\kdiff3.exekdiff3-noauto.executable=C:\Program Files\TortoiseHg\lib\kdiff3.exe[ui]ssh="C:\Program Files\TortoiseHg\lib\TortoisePlink.exe" -ssh -2hg config の結果
alias.start=!for /f "usebackq tokens=1" %i in (`"%HG%" branch`) do @(if not "$1" == "default" (if "%i" == "$1" (if not "%i" == "$2" ("%HG%" update $1 --check && "%HG%" branch $2 --force && "%HG%" commit -m "Create branch $2" && "%HG%" branch))))alias.stop=!for /f "usebackq tokens=1" %i in (`"%HG%" branch`) do @(if not "$1" == "default" (if not "%i" == "$1" (if "%i" == "$2" ("%HG%" update $2 --check && "%HG%" commit -m "Close branch $2" --close-branch && "%HG%" update $1 --check && "%HG%" merge $2 && "%HG%" commit -m "Merge branch $2" && "%HG%" branch))))bundle.mainreporoot=C:\Users\ohira\tmp\sps_25_22diff-patterns.**.doc=docdiffdiff-patterns.**.rtf=docdiffdiff-patterns.**.docx=docdiffdiff-patterns.**.docm=docdiffdiff-patterns.**.ppt=docdiffdiff-patterns.**.pptx=docdiffdiff-patterns.**.pptm=docdiffdiff-patterns.**.xls=docdiffdiff-patterns.**.xlsx=docdiffdiff-patterns.**.xlsm=docdiffdiff-patterns.**.xlsb=docdiffdiff-patterns.**.xlam=docdiffdiff-patterns.**.ods=docdiffdiff-patterns.**.odt=docdiffdiff-patterns.**.sxw=docdiffdiff-patterns.**.nb=docdiffeditor-patterns.**.py=pyscriptereditor-patterns.**.v=sigasieditor-patterns.**.vhd=sigasieditor-tools.notepad++.priority=-1editor-tools.notepad++.regkey=Software\Classes\CLSID\{B298D29A-A6ED-11DE-BA8C-A68E55D89593}\Settingseditor-tools.notepad++.regkeyalt=Software\Classes\CLSID\{00F3C2EC-A6EE-11DE-A03A-EF8F55D89593}\Settingseditor-tools.notepad++.regname=Patheditor-tools.notepad++.args=$FILES -nosessioneditor-tools.notepad++.argsln=$FILE -n$LINENUM -nosessioneditor-tools.chrimsonedit.priority=-1editor-tools.chrimsonedit.executable=cediteditor-tools.chrimsonedit.args=$FILESeditor-tools.chrimsonedit.argsln=/L:$LINENUM $FILEeditor-tools.ultraedit.priority=-1editor-tools.ultraedit.executable=uedit32editor-tools.ultraedit.args=$FILESeditor-tools.ultraedit.argsln=$FILE --lx $LINENUMeditor-tools.ultraedit.argssearch=$FILE --lx $LINENUM -f$SEARCHeditor-tools.textpad.priority=-1editor-tools.textpad.executable=TextPadeditor-tools.textpad.args=$FILESeditor-tools.textpad.argsln=$FILE($LINENUM)editor-tools.sublime_text.priority=-1editor-tools.sublime_text.executable=subleditor-tools.sublime_text.args=$FILESeditor-tools.sublime_text.argsln=$FILE:$LINENUMeditor-tools.bbedit.priority=-1editor-tools.bbedit.args=--wait $FILESeditor-tools.bbedit.argsln=+$LINENUM --wait $FILEeditor-tools.textwrangler.priority=-1editor-tools.textwrangler.executable=/usr/local/bin/editeditor-tools.textwrangler.args=--wait $FILESeditor-tools.textwrangler.argsln=+$LINENUM --wait $FILEeditor-tools.textmate.priority=-1editor-tools.textmate.executable=mateeditor-tools.textmate.args=--wait $FILESeditor-tools.textmate.argsln=--wait --line $LINENUM $FILEeditor-tools.textadept.priority=-1editor-tools.textadept.executable=taeditor-tools.textadept.args=-f -n $FILESeditor-tools.textadept.argsln=-f -n $FILE -e "goto_line($LINENUM)"editor-tools.textadept.argssearch=-f -n $FILE -e "goto_line($LINENUM)" -e "find.find_entry_text=\"$SEARCH\"]];find.find_next()"editor-tools.pspad.priority=-1editor-tools.pspad.args=$FILESeditor-tools.pspad.argsln=-$LINENUM $FILEeditor-tools.scite.priority=-1editor-tools.scite.args="-open:$FILE"editor-tools.scite.argsln="-open:$FILE" -goto:$LINENUMeditor-tools.scite.argssearch="-open:$FILE" -goto:$LINENUM "-find:$SEARCH"editor-tools.kate.priority=-3editor-tools.kate.args=$FILESeditor-tools.kate.argsln=--line $LINENUM $FILEeditor-tools.gedit.priority=-3editor-tools.gedit.args=$FILESeditor-tools.gedit.argsln=+$LINENUM $FILEeditor-tools.gvim.priority=-5editor-tools.gvim.regkey=SOFTWARE\Vim\Gvimeditor-tools.gvim.regname=patheditor-tools.gvim.args=-f $FILESeditor-tools.gvim.argsln=-f +$LINENUM $FILEeditor-tools.gvim.argssearch=-f -c":set hls" -c"/$SEARCH/" +$LINENUM $FILEeditor-tools.emacs.priority=-5editor-tools.emacs.args=$FILESeditor-tools.emacs.argsln=+$LINENUM $FILEeditor-tools.emacs.argssearch=+$LINENUM $FILE --eval '(highlight-regexp "$SEARCH")'editor-tools.eclipse.priority=-7editor-tools.eclipse.args=--launcher.openFile $FILEeditor-tools.VisualStudio.priority=-7editor-tools.VisualStudio.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\devenv.exeeditor-tools.VisualStudio.args=/EDIT $FILESeditor-tools.notepad.priority=-9editor-tools.notepad.args=$FILESeditor-tools.pyscripter.priority=-10editor-tools.pyscripter.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PyScripter_is1editor-tools.pyscripter.regkeyalt=SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\PyScripter_is1editor-tools.pyscripter.regname=DisplayIconeditor-tools.pyscripter.args=$FILESeditor-tools.sigasi.priority=-10editor-tools.sigasi.executable=${SystemDrive}/Sigasi/sigasieditor-tools.sigasi.args=$FILESeditor-tools.sigasi.argsln=$FILE +$LINENUMextensions.flow=%USERPROFILE%/hgflow/src/hgflow.pyextensions.rebase=flow.autoshelve=yeshostfingerprints.bitbacket.org=cb:4a:e9:e2:4b:ab:71:4b:b0:c2:c7:07:da:78:d7:4e:43:b2:b1:0amerge-patterns.**.doc=docdiffmerge-patterns.**.rtf=docdiffmerge-patterns.**.docx=docdiffmerge-patterns.**.docm=docdiffmerge-patterns.**.ods=docdiffmerge-patterns.**.odt=docdiffmerge-patterns.**.sxw=docdiffmerge-tools.kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $outputmerge-tools.kdiff3.regkey=Software\KDiff3merge-tools.kdiff3.regkeyalt=Software\Wow6432Node\KDiff3merge-tools.kdiff3.regappend=\kdiff3.exemerge-tools.kdiff3.fixeol=Falsemerge-tools.kdiff3.premerge=Falsemerge-tools.kdiff3.gui=Truemerge-tools.kdiff3.priority=-3merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $childmerge-tools.kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2merge-tools.kdiff3.dirdiff=Truemerge-tools.kdiff3-noauto.args=--L1 base --L2 parent1 --L3 parent2 $base $local $other -o $outputmerge-tools.kdiff3-noauto.regkey=Software\KDiff3merge-tools.kdiff3-noauto.regkeyalt=Software\Wow6432Node\KDiff3merge-tools.kdiff3-noauto.regappend=\kdiff3.exemerge-tools.kdiff3-noauto.fixeol=Falsemerge-tools.kdiff3-noauto.premerge=Falsemerge-tools.kdiff3-noauto.gui=Truemerge-tools.kdiff3-noauto.priority=-4merge-tools.kdiff3-noauto.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $childmerge-tools.kdiff3-noauto.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2merge-tools.kdiff3-noauto.dirdiff=Truemerge-tools.gvimdiff.args=--nofork -d -g -O $local $other $basemerge-tools.gvimdiff.regkey=Software\Vim\GVimmerge-tools.gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVimmerge-tools.gvimdiff.regname=pathmerge-tools.gvimdiff.priority=-9merge-tools.gvimdiff.diffargs=--nofork -d -g -O $parent $childmerge-tools.gvimdiff.diff3args=--nofork -d -g -O $parent1 $child $parent2merge-tools.meld.regkey=SOFTWARE\Meldmerge-tools.meld.regkeyalt=SOFTWARE\Wow6432Node\Meldmerge-tools.meld.regname=Executablemerge-tools.meld.gui=Truemerge-tools.meld.priority=-2merge-tools.meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $outputmerge-tools.meld.checkchanged=Truemerge-tools.meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $childmerge-tools.meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2merge-tools.meld.dirdiff=Truemerge-tools.tkdiff.args=-L local -L other $local $other -a $base -o $outputmerge-tools.tkdiff.gui=Truemerge-tools.tkdiff.priority=-5merge-tools.tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $childmerge-tools.tkdiff.diff3args=merge-tools.tkdiff.dirdiff=Falsemerge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $othermerge-tools.xxdiff.gui=Truemerge-tools.xxdiff.priority=-4merge-tools.xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $childmerge-tools.xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel' $child --title3 '$plabel2' $parent2merge-tools.xxdiff.dirdiff=Truemerge-tools.diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\merge-tools.diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\merge-tools.diffmerge.regname=Locationmerge-tools.diffmerge.priority=-7merge-tools.diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$outputmerge-tools.diffmerge.checkchanged=Truemerge-tools.diffmerge.gui=Truemerge-tools.diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $childmerge-tools.diffmerge.diff3args=--nosplash --title1='$plabel1' --title2='$clabel' --title3='$plabel2' $parent1 $child $parent2merge-tools.diffmerge.dirdiff=Truemerge-tools.diffmerge3.regkey=Software\SourceGear\Common\DiffMerge\Installermerge-tools.diffmerge3.regkeyalt=Software\Wow6432Node\SourceGear\Common\DiffMerge\Installermerge-tools.diffmerge3.regname=Locationmerge-tools.diffmerge3.priority=-7merge-tools.diffmerge3.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$outputmerge-tools.diffmerge3.checkchanged=Truemerge-tools.diffmerge3.gui=Truemerge-tools.diffmerge3.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $childmerge-tools.diffmerge3.diff3args=--nosplash --title1='$plabel1' --title2='$clabel' --title3='$plabel2' $parent1 $child $parent2merge-tools.diffmerge3.dirdiff=Truemerge-tools.p4merge.args=$base $local $other $outputmerge-tools.p4merge.regkey=Software\Perforce\Environmentmerge-tools.p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environmentmerge-tools.p4merge.regname=P4INSTROOTmerge-tools.p4merge.regappend=\p4merge.exemerge-tools.p4merge.gui=Truemerge-tools.p4merge.priority=-8merge-tools.p4merge.diffargs=$parent $childmerge-tools.p4merge.diff3args=$child $parent1 $parent2merge-tools.p4merge.dirdiff=Falsemerge-tools.p4merge.checkchanged=Truemerge-tools.tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$outputmerge-tools.tortoisemerge.regkey=Software\TortoiseSVNmerge-tools.tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVNmerge-tools.tortoisemerge.checkchanged=Truemerge-tools.tortoisemerge.gui=Truemerge-tools.tortoisemerge.priority=-9merge-tools.tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'merge-tools.tortoisegitmerge.args=/base:$base /mine:$local /theirs:$other /merged:$outputmerge-tools.tortoisegitmerge.regkey=Software\TortoiseGitmerge-tools.tortoisegitmerge.regkeyalt=Software\Wow6432Node\TortoiseGitmerge-tools.tortoisegitmerge.regname=TMergePathmerge-tools.tortoisegitmerge.checkchanged=Truemerge-tools.tortoisegitmerge.gui=Truemerge-tools.tortoisegitmerge.priority=-9merge-tools.tortoisegitmerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$outputmerge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Mergemerge-tools.ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Mergemerge-tools.ecmerge.gui=Truemerge-tools.ecmerge.priority=-10merge-tools.ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'merge-tools.ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3 --title0='$clabel' --title1='$plabel1' --title2='$plabel2'merge-tools.ecmerge.dirdiff=Truemerge-tools.ecmerge.dir3diff=Truemerge-tools.beyondcompare2.args=/ro /title1="Original" /title2="Working copy" $local $othermerge-tools.beyondcompare2.regkey=Software\Scooter Software\Beyond Comparemerge-tools.beyondcompare2.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Comparemerge-tools.beyondcompare2.regname=ExePathmerge-tools.beyondcompare2.gui=Truemerge-tools.beyondcompare2.priority=-4merge-tools.beyondcompare2.diffargs=/lro /title1='$plabel1' /title2='$clabel' $parent $childmerge-tools.beyondcompare2.dirdiff=Truemerge-tools.beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solomerge-tools.beyondcompare3.premerge=Falsemerge-tools.beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3merge-tools.beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3merge-tools.beyondcompare3.regname=ExePathmerge-tools.beyondcompare3.gui=Truemerge-tools.beyondcompare3.priority=-1merge-tools.beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $childmerge-tools.beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /romerge-tools.beyondcompare3.dirdiff=Truemerge-tools.beyondcompare3-noauto.executable=beyondcompare3merge-tools.beyondcompare3-noauto.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /reviewconflicts /solomerge-tools.beyondcompare3-noauto.premerge=Falsemerge-tools.beyondcompare3-noauto.regkey=Software\Scooter Software\Beyond Compare 3merge-tools.beyondcompare3-noauto.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3merge-tools.beyondcompare3-noauto.regname=ExePathmerge-tools.beyondcompare3-noauto.gui=Truemerge-tools.beyondcompare3-noauto.priority=-1merge-tools.beyondcompare3-noauto.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $childmerge-tools.beyondcompare3-noauto.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /romerge-tools.beyondcompare3-noauto.dirdiff=Truemerge-tools.beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solomerge-tools.beyondcompare4.premerge=Falsemerge-tools.beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4merge-tools.beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4merge-tools.beyondcompare4.regname=ExePathmerge-tools.beyondcompare4.gui=Truemerge-tools.beyondcompare4.priority=-1merge-tools.beyondcompare4.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $childmerge-tools.beyondcompare4.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /romerge-tools.beyondcompare4.dirdiff=Truemerge-tools.beyondcompare4.dir3diff=Truemerge-tools.beyondcompare4-noauto.executable=beyondcompare4merge-tools.beyondcompare4-noauto.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /reviewconflicts /solomerge-tools.beyondcompare4-noauto.premerge=Falsemerge-tools.beyondcompare4-noauto.regkey=Software\Scooter Software\Beyond Compare 4merge-tools.beyondcompare4-noauto.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4merge-tools.beyondcompare4-noauto.regname=ExePathmerge-tools.beyondcompare4-noauto.gui=Truemerge-tools.beyondcompare4-noauto.priority=-1merge-tools.beyondcompare4-noauto.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $childmerge-tools.beyondcompare4-noauto.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /romerge-tools.beyondcompare4-noauto.dirdiff=Truemerge-tools.beyondcompare4-noauto.dir3diff=Truemerge-tools.bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solomerge-tools.bcompare.premerge=Falsemerge-tools.bcompare.gui=Truemerge-tools.bcompare.priority=-1merge-tools.bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $childmerge-tools.bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandallmerge-tools.bcompare.dirdiff=Truemerge-tools.winmergeu.regkey=Software\Thingamahoochie\WinMerge\merge-tools.winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\merge-tools.winmergeu.regname=Executablemerge-tools.winmergeu.fixeol=Truemerge-tools.winmergeu.checkchanged=Truemerge-tools.winmergeu.gui=Truemerge-tools.winmergeu.priority=-10merge-tools.winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $childmerge-tools.winmergeu.diff3args=merge-tools.winmergeu.dirdiff=Truemerge-tools.araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIRmerge-tools.araxis.regappend=\ConsoleCompare.exemerge-tools.araxis.priority=-2merge-tools.araxis.args=/3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: "$output /title3:"Parent 2" $local $base $other $outputmerge-tools.araxis.premerge=Falsemerge-tools.araxis.checkconflicts=Truemerge-tools.araxis.binary=Truemerge-tools.araxis.gui=Truemerge-tools.araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $childmerge-tools.araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel" /title3:"$plabel2" $parent1 $child $parent2merge-tools.araxis.dirdiff=Truemerge-tools.araxis.dir3diff=Truemerge-tools.diffuse.priority=-3merge-tools.diffuse.args=$local $base $othermerge-tools.diffuse.gui=Truemerge-tools.diffuse.diffargs=$parent $childmerge-tools.diffuse.diff3args=$parent1 $child $parent2merge-tools.diffuse.dirdiff=Falsemerge-tools.UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exemerge-tools.UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exemerge-tools.UltraCompare.args=$base $local $other -title1 base -title3 othermerge-tools.UltraCompare.priority=-2merge-tools.UltraCompare.gui=Truemerge-tools.UltraCompare.binary=Truemerge-tools.UltraCompare.checkconflicts=Truemerge-tools.UltraCompare.checkchanged=Truemerge-tools.UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1merge-tools.UltraCompare.diff3args=$parent1 $child $parent2 -title1 $plabel1 -title2 $clabel -title3 $plabel2merge-tools.docdiff.priority=-100merge-tools.docdiff.regkey=Software\TortoiseHgmerge-tools.docdiff.regappend=\docdiff.exemerge-tools.docdiff.args=$local $base $other $outputmerge-tools.docdiff.gui=Truemerge-tools.docdiff.diffargs=$child $parentmerge-tools.docdiff.diff3args=$parent1 $child $parent2 $childmerge-tools.docdiff.usewin=Truemerge-tools.rekisa.priority=-1merge-tools.rekisa.args=-Title=Base "$base" -Title=Local "$local" -Title=Other "$other"merge-tools.rekisa.gui=Truemerge-tools.rekisa.diffargs="-Title=$plabel1" "$parent" "-Title=$clabel" "$child"merge-tools.rekisa.diff3args="-Title=$plabel1" "$parent1" "-Title=$clabel" "$child" "-Title=$plabel2" "$parent2"merge-tools.rekisa.dirdiff=Falsemerge-tools.codecompare_diff.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1merge-tools.codecompare_diff.regname=InstallLocationmerge-tools.codecompare_diff.regappend=CodeCompare.exemerge-tools.codecompare_diff.diffargs=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" $parent $childmerge-tools.codecompare_diff.diff3args=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" /title3="$plabel2" $parent1 $child $parent2merge-tools.codecompare_diff.binary=Falsemerge-tools.codecompare_diff.gui=Truemerge-tools.codecompare_diff.dirdiff=Truemerge-tools.codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1merge-tools.codecompare_merge.regname=InstallLocationmerge-tools.codecompare_merge.regappend=CodeMerge.exemerge-tools.codecompare_merge.args=/SC=TortoiseHg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"merge-tools.codecompare_merge.binary=Falsemerge-tools.codecompare_merge.gui=Truemerge-tools.codecompare_merge.checkconflicts=Truemerge-tools.codecompare_merge.premerge=Keepmerge-tools.rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\merge-tools.rhapsody_diffmerge.regkeyalt=Software\Wow6432Node\Telelogic\Rhapsody\DiffMerge\merge-tools.rhapsody_diffmerge.regname=Install Pathmerge-tools.rhapsody_diffmerge.priority=-110merge-tools.rhapsody_diffmerge.args=-xmerge $other $local -base $base -out $outputmerge-tools.rhapsody_diffmerge.checkchanged=Truemerge-tools.rhapsody_diffmerge.gui=Truemerge-tools.rhapsody_diffmerge.diffargs=-xcompare $parent $childmerge-tools.rhapsody_diffmerge.diff3args=merge-tools.kdiff3.executable=C:\Program Files\TortoiseHg\lib\kdiff3.exemerge-tools.kdiff3-noauto.executable=C:\Program Files\TortoiseHg\lib\kdiff3.exemerge-tools.winmergeu.args=/e /ub /fr /ar /wl /wm /dl base /dm other /dr local $base $other $local /o $outputmerge-tools.winmergeu.executable=C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exepaths.default=C:\Users\ohira\repos\trunk\sps_25terminal-tools.windows_command_prompt.priority=-1terminal-tools.windows_command_prompt.executable=cmdterminal-tools.windows_command_prompt.args=/K title %(reponame)sterminal-tools.powershell.priority=-2terminal-tools.powershell.executable-win=powershellterminal-tools.powershell.args=-NoExit -Command "$Host.UI.RawUI.WindowTitle = 'Windows PowerShell - %(reponame)s'"terminal-tools.rxvt_native.priority=-3terminal-tools.rxvt_native.executable-win=C:\cygwin\bin\rxvt.exeterminal-tools.rxvt_native.args=-display :0 -fn "Lucida Console-14" -tn rxvt-cygwin-native -e /bin/bashterminal-tools.cygwin_terminal.priority=-4terminal-tools.cygwin_terminal.executable-win=C:\cygwin\bin\mintty.exeterminal-tools.cygwin_termimal.args=-i /Cygwin-Terminal.ico -terminal-tools.bash_prompt.priority=-5terminal-tools.bash_prompt.executable-win=c:\cygwin\bin\bashterminal-tools.gnome-terminal.priority=-1terminal-tools.gnome-terminal.executable-linux=gnome-terminalterminal-tools.xterm.priority=-10terminal-tools.xterm.executable-unix=xtermterminal-tools.xterm.args=-T "%(reponame)s"terminal-tools.terminal_app.priority=-1terminal-tools.terminal_app.executable-osx=openterminal-tools.terminal_app.args=-a Terminal "%(root)s"terminal-tools.IPython27_QT.priority=-20terminal-tools.IPython27_QT.executable-win=c:\Python27\Scripts\ipython.batterminal-tools.IPython27_QT.executable=ipythonterminal-tools.IPython27_QT.args=qtconsoleterminal-tools.IPython27.priority=-20terminal-tools.IPython27.executable-win=c:\Python27\Scripts\ipython.batterminal-tools.IPython27.executable=ipythonterminal-tools.IPython26_QT.priority=-21terminal-tools.IPython26_QT.executable-win=c:\Python26\Scripts\ipython.batterminal-tools.IPython26_QT.executable=ipythonterminal-tools.IPython26_QT.args=qtconsoleterminal-tools.IPython26.priority=-21terminal-tools.IPython26.executable-win=c:\Python26\Scripts\ipython.batterminal-tools.IPython26.executable=ipythonterminal-tools.IPython25.priority=-22terminal-tools.IPython25.executable-win=c:\Python25\Scripts\ipython.batterminal-tools.IPython25.executable=ipythonterminal-tools.tchlsh.priority=-30tortoisehg.workbench.custom-toolbar=start stoptortoisehg.ui.language=jatortoisehg.editor="C:\Program Files\sakura\sakura.exe"tortoisehg.autoresolve=Truetortoisehg.vdiff=winmergeutortoisehg.guifork=Truetortoisehg-tools.start.command=hg start %BASE% %USERNAME%tortoisehg-tools.start.enable=istruetortoisehg-tools.start.showoutput=Truetortoisehg-tools.stop.command=hg stop %BASE% %USERNAME%tortoisehg-tools.stop.enable=istruetortoisehg-tools.stop.showoutput=Trueui.ssh="C:\Program Files\TortoiseHg\lib\TortoisePlink.exe" -ssh -2ui.username=ohira shinui.editor="C:\Program Files\sakura\sakura.exe"ui.merge=winmergeuweb.encoding=euc_jpweb.deny_push=*Yuya Nishihara
Mar 31, 2017, 11:26:27 AM3/31/17
to mercur...@googlegroups.com, ohira
On Thu, 30 Mar 2017 18:24:56 -0700 (PDT), ohira wrote:
> merge-tools.winmergeu.regkey=Software\Thingamahoochie\WinMerge\
> merge-tools.winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
> merge-tools.winmergeu.regname=Executable
> merge-tools.winmergeu.fixeol=True
> merge-tools.winmergeu.checkchanged=True
> merge-tools.winmergeu.gui=True
> merge-tools.winmergeu.priority=-10
> merge-tools.winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr
> '$clabel' $parent $child
> merge-tools.winmergeu.diff3args=
> merge-tools.winmergeu.dirdiff=True
[snip]
> merge-tools.winmergeu.regkey=Software\Thingamahoochie\WinMerge\
> merge-tools.winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
> merge-tools.winmergeu.regname=Executable
> merge-tools.winmergeu.fixeol=True
> merge-tools.winmergeu.checkchanged=True
> merge-tools.winmergeu.gui=True
> merge-tools.winmergeu.priority=-10
> merge-tools.winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr
> '$clabel' $parent $child
> merge-tools.winmergeu.diff3args=
> merge-tools.winmergeu.dirdiff=True
> merge-tools.winmergeu.args=/e /ub /fr /ar /wl /wm /dl base /dm other /dr
> local $base $other $local /o $output
> merge-tools.winmergeu.executable=C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
regkey, regkeyalt, regname を空文字で上書きしてみてください。
ohira
Apr 4, 2017, 4:14:01 AM4/4/17
to mercurial-ja, shin....@gmail.com, yu...@tcha.org
回答ありがとうございます。
おおひらです。
regkey, regkeyalt, regname を空文字で上書きすることで
merge-tools.winmergeu.executable=C:\Users\ohira\Downloads\winmerge-2.14.0-jp-131-exe\WinMerge\WinMergeU.exe
上の設定が有効となりました。
2017年4月1日土曜日 0時26分27秒 UTC+9 Yuya Nishihara:
Reply all
Reply to author
Forward
0 new messages