[B! diff] xai1981ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

xai1981 id:xai1981

diffã«é–¢ã™ã‚‹xai1981ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (9)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

WinMergeã§Excelãƒžã‚¯ãƒã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹æ–¹æ³• - Architect's Log
Cururuã‹ã‚‰ç§»è¡Œã€‚ WinMergeã‚’ä½¿ã†ã¨ã€Excelãƒžã‚¯ãƒï¼ˆVBAï¼‰ã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ â€»ä»¥ä¸‹Excel2003ã§ç¢ºèªã—ã¦ã„ã¾ã™ã€‚ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ç¢ºèªã—ã¦ã„ã¾ã›ã‚“ã€‚ WinMergeã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ã®Diffãƒ„ãƒ¼ãƒ«ã§ã€ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’è¡¨ç¤ºã§ãã¾ã™ã€‚ ï¼ ITï¼š.NET TIPS .NETæ™‚ä»£ã®ã‚½ãƒ¼ã‚¹ãƒ»ã‚³ãƒ¼ãƒ‰å·®åˆ†ãƒ„ãƒ¼ãƒ«ã¨ã¯ï¼Ÿ - VS.NET ã‚‚ã¡ã‚ã‚“VS.NETç’°å¢ƒã§ã‚‚ã“ã®WinDiffã¯ä¾¿åˆ©ã«ä½¿ã†ã“ã¨ãŒã§ãã‚‹ã®ã ãŒã€ã‚ˆã‚Šä½¿ã„ã‚„ã™ãé«˜æ©Ÿèƒ½ãªå·®åˆ†ãƒ„ãƒ¼ãƒ«ãŒã‚ã‚‹ã®ã§ã€æœ¬ç¨¿ã§ã¯ã€ãã¡ã‚‰ã®ãƒ„ãƒ¼ãƒ«ã‚’ç´¹ä»‹ã™ã‚‹ã€‚ ã€€ãã®ãƒ„ãƒ¼ãƒ«ã¨ã¯ã€ã€ŒWinMergeã€ã¨ã„ã†ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ»ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã‚ã‚‹ã€‚ ... ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã‚’ä½¿ç”¨ã™ã‚‹ã¨ã€Excelãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚‚è¡¨ç¤ºã§ãã¾ã™ã€‚ï¼ˆã‚»ãƒ«å†…ã®ãƒ†ã‚ã‚¹ãƒˆã¨ãƒžã‚¯ãƒã®ã‚½ãƒ¼ã‚¹ãŒå¯¾è±¡ã§ã™ã€‚å›³å½¢ãªã©ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã¯æ¯”è¼ƒã§ãã¾ã›ã‚“
xai1981 2019/07/01
excel

vba

diff
ãƒªãƒ³ã‚¯
æ”¹è¡Œã‚³ãƒ¼ãƒ‰ã€ç©ºç™½ã€æ”¹è¡Œã‚’ç„¡è¦–ã—ã¦diffã‚’å–ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
xai1981 2019/06/13
qiita

diff
ãƒªãƒ³ã‚¯
Atom Flight Manual
AI & MLLearn about artificial intelligence and machine learning across the GitHub ecosystem and the wider industry. Generative AILearn how to build with generative AI. GitHub CopilotChange how you work with GitHub Copilot. LLMsEverything developers need to know about LLMs. Machine learningMachine learning tips, tricks, and best practices. How AI code generation worksExplore the capabilities and be
xai1981 2017/11/30
atom

plugin

diff
ãƒªãƒ³ã‚¯
Atomã‚¨ãƒ‡ã‚£ã‚¿ã§ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’åˆ†å‰²ã—ã¦ diff ã‚’è¦‹ã‚‹æ–¹æ³•
Atomã‚¨ãƒ‡ã‚£ã‚¿ã§ã€diffã‚’å–ã‚‹æ–¹æ³•ã‚’ç´¹ä»‹ã—ã¾ã™ã€‚ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã§è¦‹ã‚‹diffã¨é•ã„ã€éžå¸¸ã«è¦‹ã‚„ã™ããªã£ã¦ãŠã‚Šã‚ªã‚¹ã‚¹ãƒ¡ã§ã™ã€‚ã•ã£ã¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€ã“ã‚Œã‹ã‚‰å¿«é© diff ç”Ÿæ´»ã‚’é€ã‚Šã¾ã—ã‚‡ã†ã€‚Atomã‚¨ãƒ‡ã‚£ã‚¿ã§ã€diffã‚’å–ã‚‹æ–¹æ³•ã‚’ç´¹ä»‹ã—ã¾ã™ã€‚ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã§è¦‹ã‚‹diffã¨é•ã„ã€éžå¸¸ã«è¦‹ã‚„ã™ããªã£ã¦ãŠã‚Šã‚ªã‚¹ã‚¹ãƒ¡ã§ã™ã€‚ã•ã£ã¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€ã“ã‚Œã‹ã‚‰å¿«é© diff ç”Ÿæ´»ã‚’é€ã‚Šã¾ã—ã‚‡ã†ã€‚ split-diff ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ split-diff ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã¨ã€æ¬¡ã®ã‚ˆã†ã« ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’å·¦å³ã«åˆ†å‰²ã—ã¦ã€å·®ç•°ãŒè¦‹ã‚„ã™ã„çŠ¶æ…‹ã§ç·¨é›†ã‚’è¡Œã†ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚ç·¨é›†ä½œæ¥ãŒä¸€å±¤æ—ã‚Šã¾ã™ãï¼ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ–¹æ³• ã§ã¯ã€ã•ã£ãã‚Šã¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã—ã¾ã„ã¾ã—ã‚‡ã†ã€‚ã“ã“ã§ã¯ã€macOS ç’°å¢ƒã§ã®Atomã«ã¤ã„ã¦ç´¹ä»‹ã—ã¾ã™ãŒã€windowsç’°å¢ƒã§ã‚‚åŒæ§˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã®ã§ã€é©å®œèªã¿æ›¿ãˆã¦ãã ã•ã„ã€‚
xai1981 2017/06/02
atom

diff

plugin
ãƒªãƒ³ã‚¯
[Vim]vimdiffã§å·®åˆ†ã‚’è¡¨ç¤ºãƒ»ãƒžãƒ¼ã‚¸ã—ã¦å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã¨ã®å·®åˆ†ã‚’ç¢ºèªã™ã‚‹
ã‚ˆã vimdiff ã§å·®åˆ†ã‚’å–ã‚‹ã®ã ã‘ã‚Œã©ãƒžãƒ¼ã‚¸ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’å¿˜ã‚Œã¦ã—ã¾ã†ã®ã§å‚™å¿˜éŒ²ã€‚ vimdiff file1 file2 ã¾ã‚ã€ã“ã‚Œã¯åŸºæœ¬ã€‚ åˆæœŸè¨å®šã® vimdiff ã®é…è‰²ã¯ã™ã”ãç›®ã«æ‚ªã„æ„Ÿã˜ã ã£ãŸã®ã§ .vimrc ã«ä»¥ä¸‹ã®è¨å®šã‚’ã—ãŸã€‚ hi DiffAdd ctermfg=black ctermbg=2 hi DiffChange ctermfg=black ctermbg=3 hi DiffDelete ctermfg=black ctermbg=6 hi DiffText ctermfg=black ctermbg=7å‚è€ƒ: ãã‚“ãªåƒ•ã‚‰ã¯ã‚³ãƒ”ãƒšãƒ—ãƒã‚°ãƒ©ãƒžãƒ¼ï¼: viãƒ»vim : vimdiffã®è‰²è¨å®š ã‚³ã‚³ã‹ã‚‰å·®åˆ†ã‚’ç¢ºèªã—ã¦ãƒžãƒ¼ã‚¸ã—ã¦ã„ãã«ã¯ãƒžãƒ¼ã‚¸ã—ãŸè¡Œã«ã‚«ãƒ¼ã‚½ãƒ«ã‚’åˆã‚ã›ã‚‹å¿…è¦ãŒã‚ã‚‹ã€‚ å¹ãå‡ºã—ã®æ ¹æœ¬ãŒã‚«ãƒ¼ã‚½ãƒ«ã®ã‚ã‚‹ç”»é¢ã€‚ æ–°è¦è¡Œã®å³æ–¹å‘ã®ãƒžãƒ¼ã‚¸å·¦ç”»é¢ã®æ–°è¦è¡Œã«ã‚«ãƒ¼ã‚½ãƒ«ã‚’
xai1981 2017/02/16
vimdiff

merge

diff
ãƒªãƒ³ã‚¯
Git, git-svn, svnã‚³ãƒžãƒ³ãƒ‰å¯¾å¿œè¡¨ - Qiita
svn git git-svn æ›´æ–° svn update git pull git svn rebase ã‚³ãƒŸãƒƒãƒˆ svn commit git add â†’ git commit or git commit -a â†’ git push <url> (gitã‚³ãƒŸãƒƒãƒˆå¾Œ) git svn dcommit è¿½åŠ svn add <file or dir> git add å‰Šé™¤ svn rm <file or dir> git rm <file> ç§»å‹• svn mv <file or dir> git mv <file> å¤‰æ›´å–ã‚Šæ¶ˆã— svn revert <file> git checkout <file> ãƒã‚° svn log git log å·®åˆ† svn diff git diff ã‚¹ã‚¤ãƒƒãƒ svn switch <url> git checkout <branch> ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ sv
xai1981 2016/12/13
git

command

subversion

diff

qiita
ãƒªãƒ³ã‚¯
Excelãƒ‡ãƒ¼ã‚¿ãªã©ã®å·®åˆ†ã‚’æ¯”è¼ƒæ¤œå‡ºã™ã‚‹ã®ã«ä¾¿åˆ©ãªWinMerge | Web Labs
xai1981 2016/11/29
excel

diff

soft
ãƒªãƒ³ã‚¯
Windowsæ¨™æº–ã‚³ãƒžãƒ³ãƒ‰ã§diffã™ã‚‹
Linuxãªã‚‰è¿·ã†ã“ã¨ç„¡ãdiffã‚³ãƒžãƒ³ãƒ‰ãŒã‚ã‚‹ã®ã§å•é¡Œãªã„ãŒã€Windowsã®å ´åˆã©ã†ã™ã‚Œã°è‰¯ã„ã‹æ‚©ã‚“ã§ã—ã¾ã†ã“ã¨ãŒã‚ã‚‹ã€‚ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã‚‹ç’°å¢ƒãªã‚‰ã¾ã ã—ã‚‚ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ç¹‹ãŒãªã„ã‚µãƒ¼ãƒãƒ¼ã¨ãªã‚‹ã¨ã€OSæ¨™æº–ã®ã‚³ãƒžãƒ³ãƒ‰ã§å®Ÿæ–½ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã®ã§èª¿ã¹ã¦ã¿ãŸã€‚ Windowsãƒãƒƒãƒãƒ•ã‚¡ã‚¤ãƒ« å®Ÿã¯ã‚³ãƒžãƒ³ãƒ‰ãŒã‚ã£ã¦fc (File Compare) ã‚’ä½¿ãˆã°è‰¯ã„ã€‚ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’ç¢ºèªã—ã¦ã¿ã‚ˆã†ã€‚ C:\>fc /? 2 ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¾ãŸã¯ãƒ•ã‚¡ã‚¤ãƒ« ã‚»ãƒƒãƒˆã‚’æ¯”è¼ƒã—ã€ç›¸é•ç‚¹ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚ FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn] [ãƒ‰ãƒ©ã‚¤ãƒ–1:][ãƒ‘ã‚¹1]ãƒ•ã‚¡ã‚¤ãƒ«å1 [ãƒ‰ãƒ©ã‚¤ãƒ–2:][ãƒ‘ã‚¹2]ãƒ•ã‚¡ã‚¤ãƒ«å2 FC /B [ãƒ‰ãƒ©ã‚¤ãƒ–1:][ãƒ‘ã‚¹1]ãƒ•ã‚¡ã‚¤ãƒ«å1 [ãƒ‰ãƒ©ã‚¤ãƒ–2:][ãƒ‘ã‚¹2]ãƒ•ã‚¡ã‚¤ãƒ«å2 /A
xai1981 2016/09/15
power_shell

diff
ãƒªãƒ³ã‚¯
subversionã«ãŠã‘ã‚‹ã€Œãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå·ã€ã€Œãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€ã«é–¢ã™ã‚‹ã‚‚ã‚„ã‚‚ã‚„ã‚’æ•´ç†ã—ã¦ã¿ãŸã€‚ Â· DQNEOæ—¥è¨˜
ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå·ã¯ä½•ã‚’æ„å‘³ã™ã‚‹ã®ã‹ï¼Ÿ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå·ã€ŒNã€ã¯ã€ãƒªãƒã‚¸ãƒˆãƒªå†…ã®ãƒ„ãƒªãƒ¼ã®åå‰ã§ã‚ã‚‹ Nç•ªç›®ã®ã‚³ãƒŸãƒƒãƒˆã‚’çµ‚ãˆãŸç›´å¾Œã®ãƒªãƒã‚¸ãƒˆãƒªã®å§¿ã§ã‚ã‚‹ ãƒ¬ãƒã‚¸ãƒˆãƒªã¨ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®é–¢ä¿‚ã¯ï¼Ÿ ãƒªãƒã‚¸ãƒˆãƒªã¯ã€ãƒ„ãƒªãƒ¼ã®é…åˆ—ã§ã‚ã‚‹(the repository is an array of trees) ãƒªãƒã‚¸ãƒˆãƒªã¯ã€ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®é›†åˆã§ã‚ã‚‹ Archã‚„Bitkeeperã¯ã“ã‚Œã¨é€†ã§ã€ãƒ¬ãƒã‚¸ãƒˆãƒªã¯ãƒ‘ãƒƒãƒ(=ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ)ã®é›†åˆã§ã‚ã‚‹ ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¨ã¯ä½•ã‹ï¼Ÿ å¤‰æ›´ã®é›†åˆ(a collection of changes) ã¤ã¾ã‚Šãƒ‘ãƒƒãƒã®ã“ã¨ åå‰ãŒã¤ã„ãŸãƒ‘ãƒƒãƒ ç•°ãªã‚‹ãƒ„ãƒªãƒ¼ã‚’æ¯”è¼ƒã—ã¦å¾—ã‚‰ã‚Œã‚‹å°Žå‡ºç‰© ã€Œãƒã‚°ï¼¸ã‚’ã€ãƒªãƒ“ã‚¸ãƒ§ãƒ³123ã§ä¿®æ£ã—ã¾ã—ãŸã€ã®æ„å‘³ åŽ³å¯†ã«è¨€ãˆã°ã€ã€Œãƒã‚°Xã‚’ã€"-r 122:123"ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã§ä¿®æ£ã—ãŸã€ã¨ã„ã†ã“ã¨ã§ã‚ã‚‹ã€‚ ã‚ˆã£ã¦ã€ä¸‹è¨˜ã®svn diffã‚³ãƒžãƒ³ãƒ‰ã¯åŒã˜ã§ã‚ã‚‹ã“ã¨ãŒç†è§£ã§ã
xai1981 2015/03/22
subversion

diff

command
ãƒªãƒ³ã‚¯
1