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

masterq id:masterq

diffã«é–¢ã™ã‚‹masterqã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (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}}

git mergeã®ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆè§£æ¶ˆã«vimdiffã‚’ä½¿ã† - ã—ãŠãƒ¡ãƒ¢
æ™®æ®µã‹ã‚‰Vimã‚’ä½¿ã†ã‚ˆã†ãªãã®é“ã®äººã«ã¯æœ‰åã‹ã¨æ€ã„ã¾ã™ãŒã€Xcodeã‚„ã‚‰VSCodeã‚„ã‚‰ã‚’ä½¿ã†äººã€…ã«ã¨ã£ã¦ã‚‚ã€ãŠã™ã™ã‚ã§ãã‚‹ã®ã§æ›¸ã„ã¦ã¿ã¾ã—ãŸã€‚ è‡ªåˆ†ã‚‚iOSã‚„ã‚‹å‰ã¯Emacsãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã€æ£ç›´ã‚ã‚“ã¾ã‚ŠVimã¯æ…£ã‚Œã¦ã„ãªã„ã®ã§ã™ãŒã€ãã‚Œã§ã‚‚ä½¿ã„ã‚„ã™ã„ã§ã™ã€‚ git mergetoolã‚’ä½¿ã† ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã‚’è§£æ¶ˆã™ã‚‹éš›ã«ã€ã‚¨ãƒ‡ã‚£ã‚¿ã‚’ä½¿ã£ã¦è©²å½“éƒ¨åˆ†ã‚’ç·¨é›†ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ãŒã€ git mergetoolã‚’åˆ©ç”¨ã™ã‚‹ã¨ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸç®‡æ‰€ã ã‘ã‚’å¤–éƒ¨ãƒ„ãƒ¼ãƒ«ã§è¡¨ç¤ºã—ã¦ãã‚Œã‚‹ã®ã§ã€ç´ æ—©ãç·¨é›†ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ vimdiffä»¥å¤–ã«ã‚‚VSCodeãªã©ä»–ã®ãƒ„ãƒ¼ãƒ«ã‚’åˆ©ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚(å€‹äººçš„ã«ã¯ã€vimdiffãŒä¸€ç•ªã‚·ãƒ¼ãƒ ãƒ¬ã‚¹ã«ç·¨é›†ã§ãã‚‹ã¨æ„Ÿã˜ã¦ã„ã¾ã™) git mergeã®å¾Œã€git mergetool -t vimdiffã‚’æ‰“ã¤ã“ã¨ã§ã€vimdiffã‚’åˆ©ç”¨ã—ãŸç·¨é›†ã«ç§»è¡Œã§ãã¾ã™ã€‚ æ¯Žå›žåˆ©ç”¨ã™ã‚‹å ´åˆã¯
masterq 2025/07/26
git

merge

diff

vim

conflict
ãƒªãƒ³ã‚¯
GitHub - Wilfred/difftastic: a structural diff that understands syntax ðŸŸ¥ðŸŸ©
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session. Dismiss alert
masterq 2023/07/22
programming

language

diff

structure
ãƒªãƒ³ã‚¯
Fail to build for Ubuntu
masterq 2023/03/31
"dpkg-source --commit" ã§ã‚ªãƒªã‚¸ãƒŠãƒ«ã¸ã®ä¿®æ£ã‚’patchã«ã§ããŸã‚“ã§ã™ãã€‚æ¯Žå›žæ‰‹å‹•ã§patchä½œã£ã¦ã¾ã—ãŸ

linux

debian

deb

package

original

diff

patch
ãƒªãƒ³ã‚¯
Differential Flame Graphs
masterq 2021/07/31
ã†ãƒ¼ã‚“ã€‚ã§ã‚‚ã“ã®æ–¹æ³•ã¯å®Ÿè£…ãŒå¤§ããå¤‰åŒ–ã—ãªã„å ´åˆã«é™ã‚‰ã‚Œã‚‹ã®ã§ã¯ã€‚

frame

graph

cpu

usage

implementation

visualization

diff
ãƒªãƒ³ã‚¯
GitHub - dandavison/delta: A syntax-highlighting pager for git, diff, grep, and blame output
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session. Dismiss alert
masterq 2020/07/31
git

diff

syntax

color

rust
ãƒªãƒ³ã‚¯
GitHub - jeffkaufman/icdiff: improved colored diff
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session. Dismiss alert
masterq 2020/01/16
æ–‡å—å˜ä½ã§å·®åˆ†ã‚’å–ã‚‹

char

diff

text

python
ãƒªãƒ³ã‚¯
GitHubã§ä»–äººã®ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¯¾ã—ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆè§£æ¶ˆã‚„è¿½åŠ ã®ä¿®æ£ã‚’è¡Œã„ã¤ã¤ãƒžãƒ¼ã‚¸ã™ã‚‹ã‚‚ã†1ã¤ã®æ–¹æ³•
GitHub å˜ç´”ãªã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§mergeã™ã‚‹æ–¹æ³•ãŒä½¿ãˆãªã„æ™‚ æœ¬ã®è™«: GitHubã§ä»–äººã®ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¯¾ã—ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆè§£æ¶ˆã‚„è¿½åŠ ã®ä¿®æ£ã‚’è¡Œã„ã¤ã¤ãƒžãƒ¼ã‚¸ã™ã‚‹æ–¹æ³•ã‚’èªã‚“ã§, ãã†è¨€ãˆã°ç§ã‚‚ãƒã‚¤ãƒˆã§æœ€åˆã«ãƒãƒ¼ãƒ (ç§ã¨ç¤¾é•·ã§2äºº)ã§ä½œæ¥ã‚’è¡Œã†ã¨ãã«æˆ¸æƒ‘ã£ãŸãªã‚ã¨æ€ã„å‡ºã—ã¾ã—ãŸ. ãªã®ã§, ä»Šã®ãƒã‚¤ãƒˆå…ˆã®ç¤¾é•·ã‹ã‚‰æ•™ãˆã¦ã‚‚ã‚‰ã£ãŸ, ã‚‚ã†1ã¤ã®æ–¹æ³•ã‚’ç´¹ä»‹ã—ã¾ã™. æ±Ÿæ·»ã•ã‚“ã®è¿°ã¹ãŸæ–¹æ³•ã¯, ã‚·ãƒ³ãƒ—ãƒ«ã§ã‚ã‹ã‚Šã‚„ã™ã„ã§ã™ãŒ, æˆ‘ã€…ã®ãƒãƒ¼ãƒ ã§ã¯ä½¿ãˆã¾ã›ã‚“. ä½•æ•…ãªã‚‰ã°, æˆ‘ã€…ã®ãƒªãƒã‚¸ãƒˆãƒªã«ã¯Travis CIã«ã‚ˆã‚‹è‡ªå‹•ãƒ†ã‚¹ãƒˆãŒå°Žå…¥ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‰ã§ã™. ãã—ã¦, ã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼ã§æ‰¿èªã‚’è²°ã„, è‡ªå‹•ãƒ†ã‚¹ãƒˆãŒæˆåŠŸã—ã¦ã„ãªã„é™ã‚Š, åŽŸå‰‡masterã«ã¯ãã®pull requestã‚’mergeã—ã¦ã¯ã„ã‘ãªã„ã¨ã„ã†ãƒ«ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã™. ãªã®ã§, ç¤¾é•·ãŒä½œã£ãŸpull requestãŒæ°—ã«å…¥ã‚‰ãªãã¦ç§ãŒä¿®æ£ã‚’ã—ãŸã„
masterq 2017/10/17
git

github

conflict

branch

merge

diff

patch
ãƒªãƒ³ã‚¯
diffoscope: in-depth comparison of files, archives, and directories
diffoscope tries to get to the bottom of what makes files or directories different. It will recursively unpack archives of many kinds and transf orm various binary formats into more human-readable form to compare them. It can compare two tarballs, ISO images, or PDF just as easily. Latest release: 309 (14 Nov 2025) You can try it now using Docker: echo foo > file1 echo bar > file2 docker pull regis
masterq 2017/05/16
æ§˜ã€…ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’textã‹htmlå½¢å¼ã§è¡¨ç¤ºã•ã›ã‚‹ã€‚fuzzy-matchingã£ã¦ã®ã¯ãªã‚“ã ã‚ã†ã‹ï¼Ÿ

diff

patch

text

html

file
ãƒªãƒ³ã‚¯
LibreOffice Calcã®ã‚¹ãƒ—ãƒ¬ãƒƒãƒ‰ã‚·ãƒ¼ãƒˆã®å¤‰æ›´ç‚¹ã‚’git diffã§è¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ã«ã™ã‚‹ - ã‚¯ã‚¯ãƒã‚°(2017-04-24)
ãƒ—ãƒã‚°ãƒ©ãƒžãƒ¼ã¯åŸºæœ¬çš„ã«ãƒ—ãƒ¬ãƒ¼ãƒ³ãƒ†ã‚ã‚¹ãƒˆå½¢å¼ãŒå¥½ããªç”Ÿãç‰©ã§ã€ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãªã‚‰Markdownã€è¡¨å½¢å¼ã®ãƒ‡ãƒ¼ã‚¿ãªã‚‰CSVãŒå®šç•ªã§ã™ã€‚ãƒ—ãƒ¬ãƒ¼ãƒ³ãƒ†ã‚ã‚¹ãƒˆå½¢å¼ã ã¨ã‚·ã‚§ãƒ«ã®ã‚³ãƒžãƒ³ãƒ‰ã‚„ç°¡å˜ãªã‚¹ã‚¯ãƒªãƒ—ãƒˆã§å®¹æ˜“ã«åŠ å·¥ã§ãã¾ã™ã—ã€Gitãƒªãƒã‚¸ãƒˆãƒªãªã©ã«æ ¼ç´ã—ãŸçŠ¶æ…‹ã§ã‚‚å¤‰æ›´ç‚¹ã‚’è¿½ã„ã‚„ã™ã„ã§ã™ã€‚ ã—ã‹ã—ã€ãŸã¾ã«ã©ã†ã—ã¦ã‚‚ã€ã‚‚ã†ã¡ã‚‡ã£ã¨ãƒªãƒƒãƒãªå½¢å¼ã®ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒžã‚¹ã‚¿ãƒ¼ãƒ‡ãƒ¼ã‚¿ã¨ã—ã¦æŒã£ã¦ãŠã‹ãªã„ã¨ã„ã‘ãªã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚Microsoft Excelã‚„LibreOfficeï¼ˆOpenOffice.orgï¼‰Calcãªã®ã‚¹ãƒ—ãƒ¬ãƒƒãƒ‰ã‚·ãƒ¼ãƒˆã‚‚ãã®ã²ã¨ã¤ã§ã™ã€‚ Microsoft Excelã®å ´åˆã€æ‚©ã¿ã‚’æŠ±ãˆã‚‹äººãŒå¤šã„ãŸã‚ã‹ã€ã™ã§ã«è‰²ã€…ãªæ–¹ãŒè§£æ±ºç–ã‚’å…¬é–‹ã•ã‚Œã¦ã„ã¾ã™ã€‚ä¾‹ãˆã°Gitã§ç®¡ç†ã—ã¦ã„ã‚‹Excelãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’è¦‹ã‚‹ã¨ã„ã†è¨˜äº‹ã§ã¯ã€Goè¨€èªžè£½ã®ãƒ„ãƒ¼ãƒ«ã‚’ä½µç”¨ã™ã‚‹æ‰‹é †ãŒç´¹ä»‹ã•ã‚Œã¦ã„ã¾ã™ã€‚ ä¸€æ–¹ã€ODFï¼ˆOpenDo
masterq 2017/04/30
libreoffice

diff

git
ãƒªãƒ³ã‚¯
gitã®diffã€mergeã‚’meldã§ã‚„ã‚‹ - Qiita
gitã§ã€ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®æ¯”è¼ƒã‚„ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã®è§£æ¶ˆã‚’meldã§ã‚„ã‚‹ã«ã¯ã€‚ ã‚„ã‚Šã‹ãŸ .gitconfigã«ä»¥ä¸‹ã‚’è¿½è¨˜ã—ã¦ãŠãã¨ã€git difftool -dã‚„git mergetoolã§meldãŒèµ·å‹•ã™ã‚‹ã‚ˆã†ã«ãªã‚‹ã€‚ [diff] tool = meld [difftool "meld"] cmd = meld $LOCAL $REMOTE [merge] tool = meld [mergetool "meld"] cmd = meld $LOCAL $BASE $REMOTE --auto-merge ã©ã†ã„ã†ã“ã¨ï¼Ÿ [difftool "meld"]ã«å‡ºã¦ãã‚‹$LOCALã¨$REMOTEã¯ã€ãã‚Œãžã‚Œå¤‰æ›´å‰ã¨å¤‰æ›´å¾Œã‚’è¡¨ã—ã¦ã„ã‚‹ã€‚1ã¤ç›®ã®ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ãŒå·¦å´ã«è¡¨ç¤ºã•ã‚Œã‚‹ã€‚ [mergetool "meld"]ã®$LOCALã¨$REMOTEã¯ã€ãã‚Œãžã‚Œæ‰‹å…ƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã‚µãƒ¼ãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãªã‚‹ã€‚ $
masterq 2017/02/17
"git difftool -dã‚„git mergetoolã§meldãŒèµ·å‹•ã™ã‚‹ã‚ˆã†ã«ãªã‚‹"

meld

diff

patch

merge
ãƒªãƒ³ã‚¯
git diff ã§ Office ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’è¦‹ã‚‹ - Qiita
å…¥ã‚ŒãŸããªã„ã¨ã¯æ€ã£ã¦ã„ã¦ã‚‚ã€æ¢ã‚€ã«æ¢ã¾ã‚Œã¬äº‹æƒ…ã§ Word, Excel, PowerPoint ãªã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ git ãƒ¬ãƒã‚¸ãƒˆãƒªã®ä¸ã§ç®¡ç†ã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“ã‹ï¼Ÿã“ã®è¨˜äº‹ã§ã¯ã€Mac ã§ Office ãƒ•ã‚¡ã‚¤ãƒ«ã® diff ã‚’å–ã‚‹æ–¹æ³•ã‚’ç´¹ä»‹ã—ã¾ã™ã€‚Linux ã§ã‚‚å¤šåˆ†å‹•ãã¯ãšã€‚ textconv æ™®é€šã€ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã‚’ git diff ã—ã¦ã‚‚ã€å¤‰æ›´å†…å®¹ãŒã‚ã‹ã‚Šã¾ã›ã‚“ã€‚ã¨ã“ã‚ãŒã€git ã«ã¯ textconv ã¨ã„ã†ã€ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ï¼ˆåˆ¥ã«ãƒã‚¤ãƒŠãƒªã˜ã‚ƒãªãã¦ã‚‚ã„ã„ã‚“ã§ã™ãŒï¼‰ã‚’ã‚³ãƒžãƒ³ãƒ‰ã«æ¸¡ã—ãŸçµæžœã‚’ diff ã«ä½¿ã†æ©Ÿèƒ½ãŒã‚ã‚Šã¾ã™ã€‚ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã«ã¯ã€JPEG ã® Exif æƒ…å ±ã® diff ã‚’å–ã‚‹ä¾‹ç‰ãŒè¼‰ã£ã¦ã„ã¾ã™ã€‚ Office ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒ†ã‚ã‚¹ãƒˆæŠ½å‡º ã§ã¯ã€Office ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãƒ†ã‚ã‚¹ãƒˆã‚’æŠ½å‡ºã™ã‚‹ã«ã¯ã©ã†ã™ã‚Œã°ã„ã„ã§ã—ã‚‡ã†ï¼ŸWindows ã® msysgit ã«ã¯ as
masterq 2017/02/14
libreoffice

git

diff
ãƒªãƒ³ã‚¯
gitã®diffè¡¨ç¤ºã‚’vimdiffã§è¦‹ã‚‹ â€“ sgryjp.log.old
Gitã§ã®diffè¡¨ç¤ºã‚’ã€vimdiffã‚’ä½¿ã†ã“ã¨ã§ã€Œå·¦å³2ç”»é¢ã€ã«ã¦è¡¨ç¤ºã™ã‚‹æ–¹æ³•ã«ã¤ã„ã¦å‚™å¿˜éŒ²ã€‚ Gitã¯ãƒãƒ¼ã‚«ãƒ«ç’°å¢ƒã§ã™ã¹ã¦å®Œçµã§ãã‚‹ãŸã‚ã¡ã‚‡ã£ã¨ã—ãŸãŠè©¦ã—ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’ä½œã‚‹ã«ã¯ä¾¿åˆ©ãªãƒ„ãƒ¼ãƒ«ã§ã€ã¾ãŸã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ„ãƒ¼ãƒ«ã®æ©Ÿèƒ½ãŒå……å®Ÿã—ã¦ã„ã‚‹ã®ã§CUIã‚ªãƒ³ãƒªãƒ¼ãªç’°å¢ƒã§ã®é–‹ç™ºæ™‚ã¯Subversionã‚ˆã‚Šä¾¿åˆ©ã ã¨æ€ã£ã¦æœ€è¿‘å°‘ã—ä½¿ã£ã¦ã„ã¾ã™ï¼ˆgit VS svnã®å…¨é¢çš„ãªè©•ä¾¡ã§ã¯ãªã„ã®ã§ã‚ã—ã‹ã‚‰ãšï¼‰ã€‚ç‰¹ã«git diffã®ã‚«ãƒ©ãƒ¼è¡¨ç¤ºã¯éžå¸¸ã«é‡å®ã™ã‚‹ã®ã§ã™ãŒã€GUIã‚¢ãƒ—ãƒªã®WinMergeã‚„meldãªã©ã®ã‚ˆã†ã«å·¦å³ã«æ–°æ—§ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒè¡¨ç¤ºã™ã‚‹ãƒ„ãƒ¼ãƒ«ã¨æ¯”ã¹ã‚‹ã¨ã€ã•ã™ãŒã«èªã¿ã‚„ã™ã•ã®ç‚¹ã§åŠ£ã‚Šã¾ã™ã€‚ãã“ã§ã€CUIç’°å¢ƒã§å·¦å³ã«ç”»é¢åˆ†å‰²ã—ã¦æ¯”è¼ƒã‚’è¡Œã†vimdiffã‚’gitã®å·®åˆ†è¡¨ç¤ºã«ã¦ä½¿ãˆã‚‹ã‚ˆã†è¨å®šã™ã‚‹æ–¹æ³•ã‚’èª¿ã¹ã¦ã¿ã¾ã—ãŸã€‚ èª¿ã¹ã¦ã¿ã‚‹ã¨éžå¸¸ã«ç°¡å˜ã§ã™ã€‚Gitã¯å¤–éƒ¨ã‚³ãƒžãƒ³ãƒ‰ã§å·®åˆ†è¡¨ç¤ºã‚’è¡Œã†difftool
masterq 2016/11/22
vim

diff

git
ãƒªãƒ³ã‚¯
wordã®docxæ–‡ç« ã‚’gitã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç† | rakkyooã®å‚™å¿˜éŒ²
æœ€è¿‘ã€ç´°ã€…ã¨gitã‚’ä½¿ã£ã¦ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã—ã¦ã„ã¾ã™ã€‚ wordæ–‡ç« ã§ã‚‚gitã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚’ã—ã‚ˆã†ã¨æ€ã†ã®ã§ã™ãŒã€git diffã—ã¦ã‚‚å¤‰æ›´å†…å®¹ãŒå‡ºã¦ãã¾ã›ã‚“ã€‚ ãã“ã§ã€ã‚ã‚Œã“ã‚Œã¨è©¦ã—ã¦ã„ãŸã®ã§ã™ãŒã€ã¨ã£ã¦ã‚‚ç°¡å˜ã«ã§ãã‚‹ã¿ãŸã„ã§ã™ã®ã§ï¼Œå‚™å¿˜éŒ²ã§ã™ã€‚ è©¦ã—ã«ã€ã€Œ~/temp_dir/temp.docxã€ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œã£ã¦ã¿ã¦ ã“ã‚“ãªæ„Ÿã˜ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œã£ãŸã‚ã¨ã§ã€
masterq 2015/09/28
word

microsoft

diff

git
ãƒªãƒ³ã‚¯
ChapterÂ 3.Â Modifying the source
masterq 2015/06/12
dquiltã®ä½¿ã„æ–¹

debian

package

diff
ãƒªãƒ³ã‚¯
Meld
MeldÂ Â Visual diff and merge tool Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems. Meld helps you review code changes and understand patches. It might even help you to figure out what's going on in that merge you keep avoiding. File comparison
masterq 2013/09/05
ä¼šç¤¾ã§åŒåƒšãŒä½¿ã£ã¦ãŸè‰¯ã•ãã†

diff

patch

gui

vcs

git

subversion

mercurial

bazaar

merge
ãƒªãƒ³ã‚¯
Binary diff
bsdiff and bspatch are tools for building and applying patches to binary files. By using suffix sorting (specifically, Larsson and Sadakane's qsufsort) and taking advantage of how executable files change, bsdiff routinely produces binary patches 50-80% smaller than those produced by Xdelta, and 15% smaller than those produced by .RTPatch (a $2750/seat commercial patch tool). These programs were or
masterq 2011/10/06
binary

diff

patch
ãƒªãƒ³ã‚¯
Software Updates: Courgette â€Ž(Chromium Developer Documentation)â€Ž
How Courgette works As I described in Smaller is faster (and safer too), we wrote a new differential compression algorithm for making Google Chrome updates significantly smaller. We want smaller updates because it narrows the window of vulnerability. If the update is a tenth of the size, we can push ten times as many per unit of bandwidth. We have enough users that this means more users will be pr
masterq 2011/10/06
binary

diff

patch
ãƒªãƒ³ã‚¯
GitHubã®ç”»åƒdiffãŒå‡„ã„
æ˜¨å¹´æœ«ã‹ã‚‰ä»•äº‹ã§ä½¿ã„å§‹ã‚ã¦ä»¥æ¥ã€ã™ã£ã‹ã‚ŠGitHubãŒãŠæ°—ã«å…¥ã‚Šã«ãªã£ã¦ã—ã¾ã£ãŸã€‚ GitHubãŒç´ æ•µãªã®ã¯ã€ä»Šã§ã‚‚æ—¥ã€…é€²åŒ–ã‚’ç¶šã‘ã¦ã„ã‚‹ã¨ã„ã†ã¨ã“ã‚ã ã€‚ä¾‹ãˆã°ã€å…ˆæ—¥å®Ÿè£…ã•ã‚ŒãŸcommité–²è¦§ã«ãŠã‘ã‚‹ç”»åƒãƒ“ãƒ¥ãƒ¼ã®æ©Ÿèƒ½æ‹¡å¼µãªã©ã‚‚ã€ãªã‚“ã ã‹ã™ã”ã„ã“ã¨ã«ãªã£ã¦ã„ã‚‹ã€‚ Behold: Image view modes - GitHub Blog æ–°ã—ã„ç”»åƒãƒ“ãƒ¥ãƒ¼ã§ã¯ã€ã‚³ãƒŸãƒƒãƒˆã«ã‚ˆã‚‹æ›´æ–°å†…å®¹ã‚’ï¼”ã¤ã®ãƒ¢ãƒ¼ãƒ‰ã§ç¢ºèªã§ãã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã‚‹ã€‚ä¾‹ãˆã°"Swipe"ãƒ¢ãƒ¼ãƒ‰ã§ã¯ã€ç”»åƒã®ä¸Šã‚’ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ï¼’ã¤ã®ç”»åƒã‚’ã‚ãã‚‹ã‚ˆã†ã«è¦‹ã‚‹ã“ã¨ãŒã§ãã‚‹ã€‚ â€œDifference"ãƒ¢ãƒ¼ãƒ‰ã§ã¯ã€ï¼’ã¤ã®ç”»åƒã«ãŠã‘ã‚‹å·®åˆ†ã‚’è¦–è¦šåŒ–ã—ã¦è¡¨ç¤ºã™ã‚‹ã€‚ã“ã‚Œã¯å¤‰æ›´ã®åº¦åˆã„ãŒå°ã•ã„å ´åˆã«ã¨ã¦ã‚‚ä¾¿åˆ©ãªæ©Ÿèƒ½ã ã€‚ å®Ÿéš›ã«ãƒ‡ãƒ¢ã‚’è§¦ã£ã¦ã¿ã‚‹ã¨ã€æ©Ÿèƒ½ã®å†…å®¹ãŒã‚ˆãåˆ†ã‹ã‚‹ã¨æ€ã†ã€‚ å€‹äººçš„ã«ã¯ã€ã“ã‚Œã‚‰ã®æ©Ÿèƒ½ã¯ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã•ã‚“ã¨é€£æºã‚’ã™ã‚‹ã«ã‚ãŸã£ã¦ã€ã¨ã¦ã‚‚ã‚ã‚ŠãŒãŸ
masterq 2011/03/25
diff

graphics
ãƒªãƒ³ã‚¯
diffã®å‹•ä½œåŽŸç†ã‚’çŸ¥ã‚‹ï½žã©ã®ã‚ˆã†ã«ã—ã¦å·®åˆ†ã‚’å°Žãå‡ºã™ã®ã‹ | gihyo.jp
UNIXã®åŸºæœ¬çš„ãªã‚³ãƒžãƒ³ãƒ‰ã®1ã¤ã§ã‚ã‚‹diffã€‚ ã“ã‚Œã«å®Ÿè£…ã•ã‚Œã¦ã„ã‚‹ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã¯å®Ÿã«èˆˆå‘³æ·±ã„ä¸–ç•ŒãŒåºƒãŒã£ã¦ã„ã¾ã™ã€‚ æœ¬ç¨¿ã§ã¯ã€ç†è€…ãŒé–‹ç™ºã—ãŸç‹¬è‡ªãƒ©ã‚¤ãƒ–ãƒ©ãƒªã€Œdtlã€ã‚’ã‚‚ã¨ã«ã€Œdiffã®ã—ãã¿ã€ã‚’è§£èª¬ã—ã¾ã™ã€‚ ã¯ã˜ã‚ã« diffã¯2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å·®åˆ†ã‚’å–ã‚‹ã®ã«ä½¿ç”¨ã™ã‚‹ãƒ—ãƒã‚°ãƒ©ãƒ ã§ã™ã€‚ ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºã‚’è¡Œã£ã¦ã„ã‚‹æ–¹ã§ã‚ã‚Œã°ã€Subversionã‚„Gitãªã©ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã‚’é€šã—ã¦åˆ©ç”¨ã—ã¦ã„ã‚‹ã“ã¨ãŒå¤šã„ã‹ã¨æ€ã„ã¾ã™ã€‚æœ¬ç¨¿ã§ã¯ãã®diffã®å‹•ä½œåŽŸç†ã«ã¤ã„ã¦è§£èª¬ã—ã¾ã™ã€‚ å·®åˆ†ã®è¨ˆç®—ã®éš›ã«é‡è¦ãª3ã¤ã®è¦ç´ å·®åˆ†ã‚’è¨ˆç®—ã™ã‚‹ã¨ã„ã†ã®ã¯æ¬¡ã®3ã¤ã‚’è¨ˆç®—ã™ã‚‹ã“ã¨ã«å¸°çµã—ã¾ã™ã€‚ ç·¨é›†è·é›¢ 2ã¤ã®è¦ç´ åˆ—ã®é•ã„ã‚’æ•°å€¤åŒ–ã—ãŸã‚‚ã® LCSï¼ˆLongest Common Subsequenceï¼‰ 2ã¤ã®è¦ç´ åˆ—ã®æœ€é•·å…±é€šéƒ¨åˆ†åˆ— SESï¼ˆShortest Edit Scriptï¼‰ ã‚ã‚‹è¦ç´ åˆ—ã‚’åˆ¥ã®è¦
masterq 2011/03/14
diff
ãƒªãƒ³ã‚¯
Diff
Building Software in the AI Era: Spec-Driven Development with Kiro IDE
masterq 2010/12/21
å·®åˆ†ã®å–ã‚Šã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã«ã¤ã„ã¦ã€‚

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