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

ishideo id:ishideo

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

${{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}}

Diffchecker - Online diff tool to compare text to find the difference between two text files
Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop
ishideo 2024/08/29
diffchecker

webservice

diff

tool

text

online
ãƒªãƒ³ã‚¯
How to find out on what dates a web page was changed using archive.org
ishideo 2023/09/17
archive.org

cdx

api

spreadsheet

function

osint

web

history

diff

diffcheck
ãƒªãƒ³ã‚¯
Devina.io
Your online development toolkit77 advanced tools for developers, designers and content editors! All categoriesGeneralTextTimeEncodingMediaNetworkRegexProgrammingHardwareSecurityWebsiteReportsOther external tools
ishideo 2023/05/11
devina.io

tools

diff

cybersecurity

dns

regex

whois
ãƒªãƒ³ã‚¯
ã‚³ãƒžãƒ³ãƒ‰ã®å°ãƒã‚¿å‚™å¿˜éŒ² - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
ishideo 2021/03/16
awk

duplicate

diff

docker

kill

git

lsof

mogrify

convert

jpg
ãƒªãƒ³ã‚¯
ãƒ†ã‚ã‚¹ãƒˆä»¥å¤–ã®diffã®å–ã‚Šæ–¹ã€ãŠã‚ˆã³Diff/Mergeãƒ„ãƒ¼ãƒ«ã®æ•´ç† - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
ishideo 2020/03/09
diff

merge

xdocdiff

exceldiff

diffpdf

diffimg

winmerge

diffmerge

vimdiff

qiita
ãƒªãƒ³ã‚¯
ã€Excelã€‘å·®åˆ†ï¼ˆDiffï¼‰ã‚’æ¯”è¼ƒã™ã‚‹æ–¹æ³•
Excel å·®åˆ†ï¼ˆDiffï¼‰ã‚’æ¯”è¼ƒã™ã‚‹ Microsoft 365 Office 2021 2019Â 2016Â 2013Â 2010 ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯å·®åˆ†ã‚’æ¯”è¼ƒã™ã‚‹ãƒ„ãƒ¼ãƒ«ã¯å¤šæ•°ã‚ã‚Šã¾ã™ãŒã€å®Ÿã¯Excelã‚‚åŒæ§˜ã«å·®åˆ†ã‚’æ¯”è¼ƒã—ã¦é•ã„ã‚’çŸ¥ã‚‹ã“ã¨ãŒã§ãã‚‹ã®ã§ã™ã€‚ å·®åˆ†ï¼ˆDiffï¼‰ã‚’æ¯”è¼ƒã™ã‚‹ãƒ„ãƒ¼ãƒ« Excelã§å·®åˆ†ï¼ˆDiffï¼‰ã‚’æ¯”è¼ƒã™ã‚‹ã«ã¯ã€Excelå˜ä½“ã§ã¯ã§ãã¾ã›ã‚“ã€‚ãƒ„ãƒ¼ãƒ«ã‚’ä½¿ã„ã¾ã™ã€‚ æ§˜ã€…ã‚ã‚‹ãƒ„ãƒ¼ãƒ«ã®ä¸ã§ã€ä»Šå›žã¯ç°¡å˜ã«ã‚µã‚¯ãƒƒã¨Excelã®å·®åˆ†ãŒæ¯”è¼ƒã§ãã‚‹ã€ŒWinMergeã€ã‚’ç´¹ä»‹ã—ã¾ã™ï¼ ã€ŒWinMergeã€ã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ã®Windowsç”¨ã®å·®åˆ†æ¯”è¼ƒãƒ„ãƒ¼ãƒ«ã§ã™ã€‚ WinMergeï¼šhttp://winmerge.org/?lang=ja WinMergeã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ WinMergeãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„ã€‚ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯1åˆ†ã»ã©ã§çµ‚ã‚ã‚Šã¾ã™ã€‚ã‚¤ãƒ³
ishideo 2020/03/09
excel

winmerge

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?
ishideo 2020/03/09
diff

vimdiff

colordiff

qiita
ãƒªãƒ³ã‚¯
diff ã‚ªãƒ—ã‚·ãƒ§ãƒ³ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
ishideo 2020/03/09
diff

vimdiff

option

vim

qiita
ãƒªãƒ³ã‚¯
ã€Macã€‘WinMergeã«1ç•ªè¿‘ã„Macç”¨é«˜æ€§èƒ½Diffï¼ˆå·®åˆ†è¡¨ç¤ºï¼‰ã‚¢ãƒ—ãƒªã€ŒCompareMergeã€ï¼ˆæ—¥æœ¬èªžå¯¾å¿œï¼‰ - Webé–¢é€£ã‚ã‚Œã“ã‚Œ
æ—¥æœ¬èªžå¯¾å¿œã§ã€ã‚µãƒ–ãƒ•ã‚©ãƒ«ãƒ€ã”ã¨æ¯”è¼ƒã€å·®åˆ†ä¿®æ£ã€æ›¸ãè¾¼ã¿ç·¨é›†ãŒã§ãã¦ã€ãƒ‡ãƒ¼ã‚¿æŠ½å‡ºã‚‚ã§ãã‚‹ï¼ ä»Šå›žã”ç´¹ä»‹ã™ã‚‹ã€ŒCompareMergeã€ã¯ã€ŒWinMergeã€ã®Macç‰ˆã¨è¨€ãˆã‚‹ã¨æ€ã„ã¾ã™ã€‚ ã¡ãªã¿ã«ã€ä»¥å‰ã€ŒFileMergeã€ã‚’ã”ç´¹ä»‹ã—ã¾ã—ãŸãŒã€æ—¥æœ¬èªžè¨å®šãŒä¸è¦ã€ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ç·¨é›†ãŒã§ãã‚‹ãªã©ã®ç‚¹ã§ã“ã¡ã‚‰ã®æ–¹ãŒã‚ªã‚¹ã‚¹ãƒ¡ã§ã™ã€‚ ä»Šå›žã”ç´¹ä»‹ã™ã‚‹æ©Ÿèƒ½ã¯ä¸‹è¨˜3ç‚¹ã€‚ ãƒ»åŸºæœ¬çš„ãªdiffæ©Ÿèƒ½ ãƒ»å·®åˆ†çµæžœã‚’htmlå½¢å¼ã§ãƒ¬ãƒãƒ¼ãƒˆä½œæˆï¼ˆä¿®æ£ã—ãŸæ‰€ã‚’å ±å‘Šã™ã‚‹ã®ã«ä¾¿åˆ©ï¼‰ ãƒ»å·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ã®æŠ½å‡ºæ–¹æ³•ï¼ˆç´å“ãƒ•ã‚¡ã‚¤ãƒ«ä½œæˆã«ä¾¿åˆ©ï¼‰ 1å¹´ãã‚‰ã„å‰ã‹ã‚‰ä½¿ã£ã¦ã¾ã™ãŒã€ç´å“ãƒ•ã‚¡ã‚¤ãƒ«ä½œæˆã€æ—¥ä»˜é•ã„ã®åŽŸç¨¿ã®ãƒã‚§ãƒƒã‚¯ã€ä»–ã®äººã¨ã®å…±æœ‰ãƒ‡ãƒ¼ã‚¿ãƒã‚§ãƒƒã‚¯ãªã©å¤§å¤‰é‡å®ã—ã¦ãŠã‚Šã¾ã™ã€‚ â–¼ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ http://sourceforge.net/projects/comparemergenosandbox/ â†“App store (ã“ã¡ã‚‰ã ã¨æœ‰æ–™ã«ãªã‚Š
ishideo 2019/04/04
diff

comparemerge

app

mac

filemerge
ãƒªãƒ³ã‚¯
Macã§ã‚µã‚¯ã£ã¨ä½¿ãˆã‚‹Diffãƒ„ãƒ¼ãƒ«ã€ï¼“é¸ã€‘ - Z.e.R.O
Diffãƒ„ãƒ¼ãƒ«ã¨ã¯ã€ãƒ†ã‚ã‚¹ãƒˆã®å·®åˆ†ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ãƒ„ãƒ¼ãƒ«ã®ã“ã¨ã€‚è¨˜äº‹ã ã£ãŸã‚Šãƒ—ãƒã‚°ãƒ©ãƒ ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã§ã‚ã£ãŸã‚Šã€2ã¤ã®ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã®ã€Œå·®åˆ†ã€ã‚’è‰²åˆ†ã‘ã—ã¦è¡¨ç¤ºã—ã¦ãã‚Œã‚‹ã„ã–ã¨ã„ã†æ™‚ã®æ•‘ä¸–ä¸»ã®ã‚ˆã†ãªãƒ„ãƒ¼ãƒ«ã€‚ ä¾‹ãˆã°ã€èª°ã‹ã«ä¿®æ£ã‚’é ¼ã‚“ã ã¯ã„ã„ã‘ã©ã€æ–‡ç« ã‚„ãƒ—ãƒã‚°ãƒ©ãƒ ã‚³ãƒ¼ãƒ‰ã®ã©ã“ãŒã©ã†ä¿®æ£ã•ã‚ŒãŸã®ã‹ã‚ã‹ã‚“ãªããªã£ã¡ã‚ƒã£ãŸã€‚ã€‚ã€‚ã¿ãŸã„ãªã¨ãã«ä½¿ã†ã¨Before/Afterã§ã©ã“ã«å·®åˆ†ãŒã‚ã‚‹ã®ã‹ãŒã‚ã‹ã‚‹ã€‚ Windowsã«ã¯ã€WinMergeï¼ˆæ—¥æœ¬èªžç‰ˆï¼‰ã£ã¦ã„ã†ç¥žãƒ„ãƒ¼ãƒ«ãŒã‚ã‚‹ã‚“ã§ã™ãŒã€Macã ã¨ãªã‹ãªã‹ã“ã‚Œã«å¯¾æŠ—ã§ãã‚‹ã„ã„ãƒ„ãƒ¼ãƒ«ãŒãªã„ã€‚ã€‚ã€‚Visual Studio Code VSCode ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ ãªã‚“ã§ã“ã®ã‚¢ãƒ—ãƒªã«ã‚‚ã£ã¨æ—©ãæ°—ã¥ã‹ãªã‹ã£ãŸã‚“ã ã‚ã†ã€‚ã€‚ã€‚ãšã£ã¨æ•¬é ã—ã¦ã„ãŸVisual Studio Code ï¼ˆVSCodeï¼‰ã€‚Microsoftã®é–‹ç™ºã—ãŸé«˜æ©Ÿèƒ½ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ã“ã®ãƒ„ãƒ¼ãƒ«ã®è‰¯ã„ã®ã¯ãƒ†ã‚ã‚¹
ishideo 2019/04/04
diff

vscode

app

textwrangler

filemerge

xcode
ãƒªãƒ³ã‚¯
Macç´”æ£ã®ãƒ•ã‚¡ã‚¤ãƒ«å·®åˆ†ç¢ºèªãƒ„ãƒ¼ãƒ«ã€ŒFileMergeã€ãŒä½¿ã„ã‚„ã™ã„ - Reasonable Code
Macã§ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’ã‚µã‚¯ãƒƒã¨å–ã‚ŠãŸã„ã¨ãã£ã¦ã‚ã‚Šã¾ã™ã‚ˆãã€‚ãã‚“ãªã¨ãã«ãŠã™ã™ã‚ãªã®ãŒã€ŒFileMergeã€ã€‚ ã€ŒFileMergeã€ã¯ã€AppleãŒæä¾›ã—ã¦ã„ã‚‹é–‹ç™ºãƒ„ãƒ¼ãƒ«ã€ŒXcodeã€ã«ä»˜å±žã—ã¦ã„ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å·®åˆ†ç¢ºèªãƒ„ãƒ¼ãƒ«ã§ã™ã€‚ç‰¹å¾´ã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šã€‚ ã‚·ãƒ³ãƒ—ãƒ«ã§ä½¿ã„ã‚„ã™ã„ Macç´”æ£ã®ãƒ•ã‚¡ã‚¤ãƒ«å·®åˆ†ç¢ºèªãƒ„ãƒ¼ãƒ«ãªã®ã§å®‰å¿ƒã—ã¦ä½¿ãˆã‚‹ ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã‹ã‚‰ã‚‚å®Ÿè¡Œã§ãã‚‹ å¿˜ã‚Œãªã„ã‚ˆã†ã«ä½¿ã„æ–¹ã‚’ãƒ¡ãƒ¢ã—ã¦ãŠãã¾ã™ã€‚ FileMergeã‚’ä½¿ã†ãŸã‚ã®äº‹å‰æº–å‚™ FileMergeã¯â€ŽXcodeã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ã¾ãšã¯â€ŽXcodeã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãŠãã¾ã—ã‚‡ã†ã€‚ FileMergeã®ä½¿ã„æ–¹ ã€Œã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã€ > ã€ŒXcode.appã€ > ã€Œãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å†…å®¹ã‚’è¡¨ç¤ºã€ã‚’é¸æŠžã—ã¾ã™ã€‚
ishideo 2019/04/04
mac

diff

filemerge

opendiff

app

xcode
ãƒªãƒ³ã‚¯
Macã§ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆæ™‚ã«å˜èªžå·®åˆ†ã‚‚å‡ºã™ãƒžãƒ¼ã‚¸ãƒ„ãƒ¼ãƒ«ã€ŒDiffMergeã€ - Qiita
ã¯ã˜ã‚ã« ä»Šã¾ã§gitã®ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã‚’è§£æ¶ˆã™ã‚‹ãƒžãƒ¼ã‚¸ãƒ„ãƒ¼ãƒ«ã¨ã—ã¦vimdiffã‚’ä½¿ã£ã¦ã„ãŸãŒã€diffchar.vimã‚’ä½¿ã£ã¦ã‚‚å˜èªžã”ã¨ã®å·®åˆ†ã‚’ã†ã¾ãè¡¨ç¤ºã—ã¦ãã‚Œãªã„ã®ã§ã€csvãªã©ã®ãƒžãƒ¼ã‚¸ã®éš›ã«ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸç®‡æ‰€ã‚’ã‚ã–ã‚ã–é•ã†diffãƒ„ãƒ¼ãƒ«ã‚’ä½¿ã£ã¦å·®åˆ†ã‚’ç¢ºèªã™ã‚‹ãªã©ã®é¢å€’ãªä½œæ¥ãŒç™ºç”Ÿã—ãŸã€‚ ãã“ã§ã€å˜èªžã”ã¨ã®å·®åˆ†ã‚’å‡ºã—ã¦ãã‚Œã‚‹ãƒžãƒ¼ã‚¸ãƒ„ãƒ¼ãƒ«ã‚’æŽ¢ã™ã“ã¨ã«ã—ãŸã€‚ Windowsã§ã‚ã‚Œã°WinMergeã¨ã„ã†æœ‰åãªãƒ„ãƒ¼ãƒ«ãŒã‚ã‚‹ãŒã€Macã ã¨æ„å¤–ã¨ã‚ˆã„ã®ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã€‚ã¡ãªã¿ã«è‡ªåˆ†ã®PCã®OSã¯ä»¥ä¸‹ã€‚ macOS High Sierra 10.13.6 æŽ¢ã—ã¦ã¿ãŸã¨ã“ã‚ã€DiffMergeã¨ã„ã†ãƒ„ãƒ¼ãƒ«ãŒã‚ˆã•ãã†ã€‚ ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ãƒšãƒ¼ã‚¸ã‹ã‚‰ã€ŒOS X 10.6+ Installer (Intel)ã€ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã€‚ ã‚ã¨ã¯pkgãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã„ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®æŒ‡ç¤ºã«å¾“ã†ã ã‘ã€‚ gitã®è¨
ishideo 2019/04/04
mac

diff

diffmerge

app

qiita
ãƒªãƒ³ã‚¯
Vimã®diffãƒ¢ãƒ¼ãƒ‰é–¢é€£Tips
B! 257 0 0 0 Vimã®diffãƒ¢ãƒ¼ãƒ‰æ©Ÿèƒ½ã¯Vimã‚’ä½¿ã†ã¹ãä¸€ã¤ã®å¤§ããªç†ç”±ã«ãªã‚‹ãã‚‰ã„ä¾¿åˆ©ãªã‚‚ã®ã ã¨æ€ã„ã¾ã™ã€‚ é•ã„ã‚’è¦‹ã‚‹ãŸã‚ã ã‘ã§ã‚‚å·¦å³ã«ä¸¦ã¹ã¦è¦‹ã‚Œã‚‹ã®ã§ diffã‚³ãƒžãƒ³ãƒ‰ãªã‚“ã‹ã‚ˆã‚Šã‚‚ã‚ˆã‚Šã‚ã‹ã‚Šã‚„ã™ãè¦‹ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚ ãã®diffãƒ¢ãƒ¼ãƒ‰é–¢é€£ã®Vimã®æ©Ÿèƒ½ã‚„ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ç‰ã®ã¾ã¨ã‚ã€‚ vim -d vimdiff :diffsplit diffãƒ¢ãƒ¼ãƒ‰ã§ã®æ“ä½œ diffãƒ¢ãƒ¼ãƒ‰ã®è¨å®š :DiffOrig linediff.vim vcscommand.vim diffchar.vim vim-diff-enhanced vim -d 2ã¤ã®ä¼¼ãŸã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”ã¹ãŸã„æ™‚ã« $ vim -d a.txt b.txt ã¨ã™ã‚‹ã¨2ã¤ã‚’æ¯”ã¹ãŸçŠ¶æ…‹ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚ 3ã¤ä»¥ä¸ŠåŒæ™‚ã«æ¯”è¼ƒã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ diffãƒ¢ãƒ¼ãƒ‰ã§ã¯ä»¥ä¸‹ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ diff: on,
ishideo 2018/03/14
vim

diffsplit

diff

vimdiff

vimget

linediff.vim
ãƒªãƒ³ã‚¯
python-fire/examples/diff/diff.py at master Â· google/python-fire
ishideo 2017/07/08
google

python-fire

cli

github

diff

example
ãƒªãƒ³ã‚¯
Comparing buffers with vimdiff
Vimâ€™s diff mode allows us to easily compare the contents of two (or more) buffers. We can start Vim in diff mode using the vimdiff command, or if Vim is already running we can switch to diff mode using the :diffthis command. The beauty of the :diffthis command is that it works with unnamed buffers, whereas vimdiff can only work with files. Using vimdiff to compare two files We can call vimdiff fro
ishideo 2016/09/09
vim

windo

diffthis

diff

vimdiff
ãƒªãƒ³ã‚¯
Vimã¨æ—¥æœ¬èªžç·¨é›†ï¼ˆ2ï¼‰: ä¿®æ£å‰å¾Œã®åŽŸç¨¿ã®å·®åˆ†ã‚’ä¸€çž¬ã§ãƒã‚§ãƒƒã‚¯ã™ã‚‹ - the code to rock
Vimã¨æ—¥æœ¬èªžç·¨é›†ã‚·ãƒªãƒ¼ã‚ºç¬¬2å›žã€‚ å‰å›žã¯ã“ã¡ã‚‰ã€‚ note103.hateblo.jp ã‘ã£ã“ã†ãƒ‹ãƒƒãƒãªå†…å®¹ã ã£ãŸã¨æ€ã†ãŒã€ä»Šå›žã¯ã‚‚ã†å°‘ã—ä½¿ç”¨é »åº¦ï¼†æ±Žç”¨æ€§ãŒé«˜ã„ã‹ã‚‚ã—ã‚Œãªã„ã€‚ å‰æãƒ»çŠ¶æ³è¨å®š ã‚ˆãã‚ã‚‹è§£æ±ºç–ãƒ»ãã®ä½•ãŒå•é¡Œã‹ è§£æ±ºç– åˆ¥è§£ fugitive.vim / Gdiff diffsplit, VDSplit ã¾ã¨ã‚ å‰æãƒ»çŠ¶æ³è¨å®š è¤‡æ•°äººã§åˆ©ç”¨ãƒ»å…±æœ‰ã™ã‚‹ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãŒã‚ã‚‹ã¨ã—ã¦ã€ãã‚Œã‚’ã¾ãšè‡ªåˆ†ãŒæ›¸ã„ãŸã¨ã—ã‚ˆã†ã€‚ å¤§ä½“å†…å®¹ãŒã¾ã¨ã¾ã£ãŸã®ã§ãƒ‡ãƒ¼ã‚¿ã‚’ä»–ã®ãƒ¡ãƒ³ãƒãƒ¼ã«æ¸¡ã—ã€ã€Œæ°—ã«ãªã‚‹ã¨ã“ã‚ãŒã‚ã£ãŸã‚‰é©å½“ã«æ‰‹ã‚’å…¥ã‚Œã¨ã„ã¦ã€ãªã‚“ã¦è¨€ã£ã¦ãŠã„ãŸã‚‰ã€ã—ã°ã‚‰ãã—ã¦ä¿®æ£ç‰ˆãŒå±Šã„ãŸã¨ã—ã‚ˆã†ã€‚ ã§ã‚‚ãƒ‘ãƒƒã¨è¦‹ãŸã¨ã“ã‚ã€ã©ã“ãŒä¿®æ£ã•ã‚ŒãŸã®ã‹ã‚ã‹ã‚‰ãªã„ã€‚ ãŸã¨ãˆã°ã€ã“ã‚ŒãŒä¿®æ£å‰ã€‚*1 ãã—ã¦ä¿®æ£å¾Œã€‚ ãã®ã‚ˆã†ãªã¨ãã«ã€ã©ã†ã™ã‚‹ã‹ã€‚ ã‚ˆãã‚ã‚‹è§£æ±ºç–ãƒ»ãã®ä½•ãŒå•é¡Œã‹ ä¸€ç•ªå®¹æ˜“ãªé¸æŠžè‚¢ã¨ã—ã¦ã¯ã€ã€Œã˜ã£ãã‚Šè¦‹ã‚‹ã€ã€‚ ã¾
ishideo 2016/09/09
vdsplit]

vim

diff

windo

diffthis

gdiff

fugitive

diffsplit
ãƒªãƒ³ã‚¯
å¤šè¨€èªžã®ãƒ†ã‚ã‚¹ãƒˆæ¯”è¼ƒã«æœ€é©ãªDiffãƒ„ãƒ¼ãƒ«ã‚’æŽ¢ã—ã¦ã¿ã‚‹ - WonderPlanet DEVELOPER BLOG
ä»Šå›žã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ãƒ–ãƒã‚°ã‚’æ‹…å½“ã™ã‚‹æ«»äº•ã§ã™ã€‚ é‹å–¶ã®ãŠä»•äº‹ã§ãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼ã®åå‰ã‚’è€ƒãˆãŸã‚Šã™ã‚‹ã®ã§ã™ãŒã€ãã®åå‰ã‚’å¤šè¨€èªžã«ãƒãƒ¼ã‚«ãƒ©ã‚¤ã‚ºå¯¾å¿œã‚’ã—ã¦ã€ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«åæ˜ ã•ã›ã‚‹ã¨ã‚†ã†ä½œæ¥ã‚‚ã‚ã‚Šã¾ã™ã€‚ æ„å›³ã—ãªã„å¤‰æ›´ã‚’ã—ã¦ãƒã‚°ã‚‰ã—ã¦ã¯å¤§å¤‰ãªã®ã§ã€å¤‰æ›´ã®å‰å¾Œã§æ¯”è¼ƒã‚’å–ã‚‹ã®ã§ã™ãŒã€è¤‡æ•°ã®è¨€èªžãŒå…¥ã£ã¦ã„ã‚‹ã‹ã‚‰ã‹ã€ä¸Šæ‰‹ãå·®åˆ†ãŒå–ã‚Œã¾ã›ã‚“ã€‚ ä½¿ã£ã¦ã„ã‚‹æ¯”è¼ƒãƒ„ãƒ¼ãƒ«ãŒXcodeã«ä»˜ã„ã¦ã„ã‚‹ã€ŒFileMergeã€ã ã‹ã‚‰ã§ã—ã‚‡ã†ã‹ï¼Ÿ ãã‚“ãªã‚ã‘ã§ã€å¤‰æ›´ã®å‰å¾Œã§ä»¥ä¸‹å·®åˆ†ã®æœ‰ã‚‹ãƒ†ã‚ã‚¹ãƒˆã‚’ç”¨æ„ã—ã¦ã€è‰²ã€…ãªãƒ„ãƒ¼ãƒ«ã§æ¯”è¼ƒã‚’å–ã£ã¦è©¦ã—ã¦ã¿ã‚ˆã†ã¨æ€ã„ã¾ã™ã€‚ ã€å·®åˆ†ã€‘ï¼ˆè©³ç´°ãªå†…å®¹ã¯æ¯”è¼ƒãƒ„ãƒ¼ãƒ«ã®å®Ÿæ–½çµæžœã‚’å‚ç…§ï¼‰ Line3ï¼šæ—¥æœ¬èªžãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼åã€è‹±èªžãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼åã€æ—¥ä»˜ Line5ï¼šéŸ“å›½èªžãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼åã€ä¸å›½èªžï¼ˆç¹ä½“å—ï¼‰ãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼åã€æ—¥ä»˜ Line8ï¼š1è¡Œå‰Šé™¤ Line9ï¼šæ•°å€¤ Line10ï¼šè‹±èªžãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼å ã€æœŸå¾…å€¤ã€‘ Macç’°å¢ƒã«ãŠã„ã¦ã€å¤šè¨€
ishideo 2016/07/22
mac

diff

textwrangler
ãƒªãƒ³ã‚¯
å·®åˆ†è¡¨ç¤ºã‚½ãƒ•ãƒˆ Rekisa
Rekisaã¯ä¸€åº¦ã«3ã¤ä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã§ãã‚‹ã€ãƒ†ã‚ã‚¹ãƒˆæ¯”è¼ƒã‚½ãƒ•ãƒˆã§ã™ã€‚ ä¸»ãªç‰¹å¾´ã‚ãƒ¼ãƒœãƒ¼ãƒ‰æ“ä½œã«é©ã—ãŸãƒ†ã‚ã‚¹ãƒˆã‚¨ãƒ‡ã‚£ã‚¿é¢¨ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹è¡Œå˜ä½ã®é•ã„ã‚’èƒŒæ™¯è‰²ã§è¡¨ç¤ºã—ã€æ–‡å—å˜ä½ã®é•ã„ã¯ä¸‹ç·šã§è¡¨ç¤ºå·¦å³ã®ãƒ†ã‚ã‚¹ãƒˆã®ã‚«ãƒ¼ã‚½ãƒ«ãŒæ–‡å—å˜ä½ã§é€£å‹•ã™ã‚‹ç‚ºã€ãƒ†ã‚ã‚¹ãƒˆã®å¯¾å¿œé–¢ä¿‚ãŒã‚ã‹ã‚Šã‚„ã™ã„SHIFT_JISã€EUC-JPã€UTF-8ç‰ã€æ§˜ã€…ãªæ–‡å—ã‚³ãƒ¼ãƒ‰ã«å¯¾å¿œã—ã€è‡ªå‹•åˆ¤åˆ¥ã—ã¦é–‹ãæ§˜ã€…ãªã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒä½¿ç”¨å¯èƒ½ãªç‚ºã€ä»–ã®ã‚½ãƒ•ãƒˆã¨ã®é€£æºãŒå®¹æ˜“â€œsvn.exeâ€ ã‚’ä½¿ç”¨ã—ã¦Subversionã¨é€£æºã™ã‚‹ã“ã¨ãŒå¯èƒ½åŸºæœ¬æƒ…å ±ãƒãƒ¼ã‚¸ãƒ§ãƒ³ ã€€ã€€ã€€ï¼š 0.32.018 å‹•ä½œç’°å¢ƒ ã€€ã€€ã€€ã€€ï¼š Windows 2000ã€XP å¿…è¦ãªãƒ©ã‚¤ãƒ–ãƒ©ãƒª ï¼š .NET Framework 1.1ä»¥ä¸Š é–‹ç™ºç’°å¢ƒ ã€€ã€€ã€€ã€€ï¼š Windows XP SP2 + Visual Studio 2003(.NET 1.1ç”¨)ã€2005(
ishideo 2016/07/13
windows

diff

software

tool
ãƒªãƒ³ã‚¯
How to get the difference between two arrays in JavaScript?
Is there a way to return the difference between two arrays in JavaScript? For example: var a1 = ['a', 'b']; var a2 = ['a', 'b', 'c', 'd']; // need ["c", "d"]
ishideo 2016/07/08
javascript

array

diff

difference

filter

minus

underscorejs
ãƒªãƒ³ã‚¯
PDFã‚’æ¯”è¼ƒã—ã¦å·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œæˆã™ã‚‹æ–¹æ³•ï¼ˆAdobeç´”æ£ vs. DiffPDFï¼‰
PDFæ–‡æ›¸ã®å¤‰æ›´å‰å¾Œã®ã€Œé•ã„ã€ã‚’æ¯”è¼ƒè¡¨ç¤ºã—ãŸã„ã€‚ã€‚ã€‚ã€Œã©ã“ãŒå¤‰ã‚ã£ãŸã®ï¼Ÿã€ã‚’ç°¡å˜ã«æŠŠæ¡ã—ãŸã„ã€‚ã€‚ã€‚ãã‚“ãªã¨ãã«ä½¿ãˆã‚‹PDFã®å·®åˆ†ã‚’è¡¨ç¤ºã—ãŸã‚Šã€å·®åˆ†ãƒ‡ãƒ¼ã‚¿å…¥ã‚Šã®PDFã‚’ä½œæˆã™ã‚‹æ‰‹æ®µã‚’ï¼’ã¤ã€ç´¹ä»‹ã—ã¾ã™ã€‚ ä¸€ã¤ã¯ã€Adobe Acrobatã«æ¨™æº–æè¼‰ã•ã‚Œã¦ã„ã‚‹æ–‡æ›¸æ¯”è¼ƒæ©Ÿèƒ½ã§ã™ã€‚ã‚‚ã†ä¸€ã¤ã¯ã€DiffPDFã¨ã„ã†å°‚ç”¨ã‚½ãƒ•ãƒˆã§ã™ã€‚ãªã‚“ã¨ãªãAdobeç´”æ£ãƒ„ãƒ¼ãƒ«ã®ã»ã†ãŒã‚ˆã•ãã†ã§ã™ãŒã€ç§ãŒå®Ÿéš›ã«ä½¿ã£ã¦ã¿ãŸæ„Ÿè§¦ã ã¨ã€DiffPDFã®ã»ã†ãŒãŠã™ã™ã‚ã§ã™ã€‚ PDFæ–‡æ›¸ï¼ˆè«–æ–‡ï¼‰ã®ãƒã‚§ãƒƒã‚¯ã‚’å…ˆè¼©ã‚„å…ˆç”Ÿã«é ¼ã‚€ã¨ãã«ã€ä»Šå›žç´¹ä»‹ã™ã‚‹æ–¹æ³•ã§ä½œæˆã—ãŸå·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ï¼ˆ.pdfï¼‰ã‚’ã€å¤‰æ›´å¾Œã®PDFã«æ·»ãˆã‚‹ã¨ã€èªã‚€å´ã®åŠ©ã‘ã«ãªã‚‹ã¨æ€ã„ã¾ã™ã€‚ â€»DiffPDFã®ä¾‹ï¼ˆå·¦ãŒBeforeãƒ»å³ãŒAfterï¼‰â†“ å„ãƒ„ãƒ¼ãƒ«ã®ä½¿ã„æ–¹ã¨ã€é•ã„ã€æ³¨æ„ç‚¹ã€å¼±ç‚¹ãªã©ã‚’ç´¹ä»‹ã—ã¾ã™ã€‚ ç›®æ¬¡ 1. PDFã®å·®åˆ†ãŒä¾¿åˆ©ãªã‚±ãƒ¼ã‚¹2. ãƒ„ãƒ¼ãƒ«2.1. ï¼‘ï¼ŽAdobe
ishideo 2015/03/06
diff

pdf

acrobat

latex
ãƒªãƒ³ã‚¯
1 2 æ¬¡ã®ãƒšãƒ¼ã‚¸