KDiff3å°Žå…¥ã®è©± - monjudoh’s diary本題 Mercurialã§æ‰‹å‹•mergeãŒå¿…è¦ãªæ™‚ã«WinMergeを使用ã—ã¦ã„ãŸã®ã‚’KDiff3ã«åˆ‡ã‚Šæ›¿ãˆãŸã€‚ Kdiff3 Mercurial.iniã®è¨å®š [merge-tools] ;[merge-tools]ã®ä¸€ç•ªä¸Šã«â†“を書ã„ã¦ãŠã‘ã°OK kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.regkey=Software\KDiff3 kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=True kdiff3.gui=True WinMergeã§æ»ã‚“ã 件 Win用ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ç‰ˆMercurialインスコã—ãŸæ™‚ã«æœ€åˆã‹ã‚‰å…¥ã£ã¦ãŸMercurial.ini*1ã¯â†“ã§ã€ winmerge.args=/e /u /dl loca
{{#tags}}- {{label}}
{{/tags}}