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

starsky5 id:starsky5

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

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

ã‚¿ãƒ–ã®ã‚¹ãƒšãƒ¼ã‚¹åŒ–ã¯ã‚¿ãƒ–å¹…ã‚ˆã‚Šã‚‚é‡è¦ã§ã‚ã‚‹ : 404 Blog Not Found
2006å¹´04æœˆ30æ—¥03:46 ã‚«ãƒ†ã‚´ãƒªOpen Source ã‚¿ãƒ–ã®ã‚¹ãƒšãƒ¼ã‚¹åŒ–ã¯ã‚¿ãƒ–å¹…ã‚ˆã‚Šã‚‚é‡è¦ã§ã‚ã‚‹ ã‚ãˆã¦æ–è¨€ã—ã¾ã™ã€‚å›ãŸã¡ã¯åŠåˆ†ã—ã‹ã‚ã‹ã£ã¦ã„ãªã„ã¨ã€‚ Charsbar::Note - ã‚¿ãƒ–ã¨ã‚¹ãƒšãƒ¼ã‚¹ã®è©± ã‚ãˆã¦æ–è¨€ã—ã¨ãã¾ã™ã€‚ã“ã‚“ãªãƒ¢ãƒ³ã¯ãƒãƒƒãƒ‰ãƒŽã‚¦ãƒã‚¦ãªã‚“ã§ã‚ã£ã¦ã€ãƒ™ã‚¹ãƒˆãƒ—ãƒ©ã‚¯ãƒ†ã‚£ã‚¹ã§ã‚‚ãªã‚“ã§ã‚‚ãªã„ã€ã¨ã€‚ æœ€é€Ÿã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ç ”ç©¶ä¼š :: ã‚¿ãƒ–ã¨ã‚¹ãƒšãƒ¼ã‚¹ã¨èŒãƒ‡ã‚£ã‚¿ã®è©±ãªã‚“ã‹ãã‚‚ãã‚‚ã‚¿ãƒ–ã‚’ä½¿ã‚ãšã«ã‚¹ãƒšãƒ¼ã‚¹4ã§çµ±ä¸€ã›ã‚ˆã£ã¦ã®ã¯ãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚ºã‚’ãƒ”ã‚¯ã‚»ãƒ«å˜ä½ã§æŒ‡å®šã—ãŸãŒã‚‹ãƒ‡ã‚¶ã‚¤ãƒŠã®è¨€ã„åˆ†ã¿ãŸã„ã§æ°—ã«é£Ÿã‚ãªã„ã€‚å›ãŸã¡ã¯ã€patchã®ã“ã¨ã‚’ãã‚Œã„ã•ã±ãƒ¼ã‚Šå¿˜ã‚Œã¦ã„ã‚‹ã€‚ äººã®ã‚³ãƒ¼ãƒ‰ã‚’ç›´ã—ãŸã‚Šã€äººã«ã‚³ãƒ¼ãƒ‰ã‚’ç›´ã—ã¦ã‚‚ã‚‰ã£ãŸã‚Šã—ãªãã¦ã‚‚ã„ã„ã¨ã„ã†ã®ã§ã‚ã‚Œã°ã€å›ãŸã¡ã®ã„ã„åˆ†ã‚‚ã‚‚ã£ã¨ã‚‚ã ã€‚ã—ã‹ã—ã€äººã¨ã‚³ãƒ¼ãƒ‰ã‚’ã‚„ã‚Šã¨ã‚Šã™ã‚‹æ™‚ã«patchã‚’ã‚„ã‚Šã¨ã‚Šã™ã‚‹å ´åˆã€tabã¯é ãŒç—›ã„ä»¥å¤–ã®ä½•è€…ã§ã‚‚ãªã„ã€‚ ä»¥ä¸‹ã«äºŒã¤ã®
starsky5 2010/05/12
perl

diff

tips
ãƒªãƒ³ã‚¯
diffã‚’ã¿ã‚‹ãªã‚‰vimdiffãŒã¯ã£ãã‚Šè¨€ã£ã¦ä¾¿åˆ©ã™ãŽã‚‹ä»¶ - yamazakiccs--ã®ã‚‚ã£ã•ã‚‚ã•æ„ŸãŒãŸã¾ã‚‰ãªã„ãƒ–ãƒã‚°
ã¾ã¨ã‚ vimdiff filename1 filename2 ã‚‚ã—ãã¯ vim > :vertical diffsplit filename ãã£ã‹ã‘ GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ http://0xcc.net/blog/archives/000208.html ã“ã®ã€ŒGNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ã€ã®è¨˜äº‹ã®ãƒ–ã‚¯ãƒžã‚³ãƒ¡ãƒ³ãƒˆã« id:shoma [Tool] [Vim] --side-by-side ã™ã‚‹ãªã‚‰ vimdiff ã™ã‚‹ã¨ã‹ã€‚è‰²ã‚‚ã¤ãã—ã€‚ã¨ã„ã†ã®ãŒã‚ã£ã¦ã€ãªã‚“ã ãã‚Œãƒ¼ã£ã¦ã‚«ãƒ³ã‚¸ã§èª¿ã¹ã¦ã¿ãŸã€‚ vimdiff Vim documentation: diff http://www.ac.cyberhome.ne.jp/~yakahaira/vimdoc/diff.html ã‚‚ã—ãã¯ :help vimdiff ã¨ã‚Šã‚ãˆãšã€ vimdiff filename1
starsky5 2010/03/24
vim

diff
ãƒªãƒ³ã‚¯
git mergetoolã«ã¤ã„ã¦ã‚ã‚Œã“ã‚Œè©¦ã—ãŸçµæžœ - Seasons.NET
gitã§ã¯ã€mergetoolã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’æ‰“ã¡è¾¼ã‚€ã¨ ãƒžãƒ¼ã‚¸ã®ç‚ºã«è¨å®šã•ã‚ŒãŸãƒ„ãƒ¼ãƒ«ãŒç«‹ã¡ä¸ŠãŒã‚Šã¾ã™ã€‚ Macã®å ´åˆã€æ¨™æº–ã§ã¯ã€opendiffãŒé¸ã°ã‚Œã¾ã™ã€‚ ã¨ã¯ã„ãˆä½¿ã„å‹æ‰‹ãŒã‚ˆã„ã‹ã¨ã„ã†ã¨ãã†ã§ã‚‚ãªã„ã®ã§ã›ã£ã‹ãã®æ©Ÿä¼šã§ã™ã‹ã‚‰ è‰²ã€…è©¦ã—ã¦ã¿ã¾ã—ãŸã€‚ â—Changes.app ã“ã‚Œã¯ã€æ—¥é ƒå·®åˆ†ãƒ„ãƒ¼ãƒ«ã¨ã—ã¦æ„›ç”¨ã—ã¦ã„ã‚‹ã‚·ã‚§ã‚¢ã‚¦ã‚§ã‚¢ã§ã™ãŒã€ å®Ÿã¯ã€Git mergetoolã¨ã—ã¦ã‚‚è¨å®šã§ãã‚‹ãã†ã§ã€‚ ã“ã¡ã‚‰ã®ãƒšãƒ¼ã‚¸ãŒå‚è€ƒã«ãªã‚Šã¾ã™ã€‚ ä»»æ„ã®å ´æ‰€ã«git-chdiff.shã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œæˆã—ã€ chmod +xã§å®Ÿè¡Œæ¨©é™ã‚’ã¤ã‘ã¦ãŠãã¾ã™ã€‚ ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…å®¹ã¯ã€ä»¥ä¸‹ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’è¨˜è¿°ã—ã¾ã™ã€‚ #!/bin/sh [ $# -eq 7 ] && /usr/bin/env chdiff --wait "$2" "$5" ãã—ã¦ã€git configã‚³ãƒžãƒ³ãƒ‰ã§ã€å¤–éƒ¨diffãƒ„ãƒ¼ãƒ«ã¨ã—ã¦é–¢é€£ã¥ã‘ã¦ãŠã
starsky5 2010/03/24
git

diff

software
ãƒªãƒ³ã‚¯
GT Nitro: ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚·ãƒ³ã‚°ãƒ»ãƒ‰ãƒ©ãƒƒã‚°ãƒ¬ãƒ¼ã‚·ãƒ³ã‚°ã‚²ãƒ¼ãƒ - Google Play ã®ã‚¢ãƒ—ãƒª
GT Nitro: Car Game Drag Raceã¯ã€å…¸åž‹çš„ãªã‚«ãƒ¼ã‚²ãƒ¼ãƒ ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã‚¹ãƒ”ãƒ¼ãƒ‰ã€ãƒ‘ãƒ¯ãƒ¼ã€ã‚¹ã‚ãƒ«å…¨é–‹ã®ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚¹ã‚²ãƒ¼ãƒ ã§ã™ã€‚ãƒ–ãƒ¬ãƒ¼ã‚ã¯å¿˜ã‚Œã¦ã€ã“ã‚Œã¯ãƒ‰ãƒ©ãƒƒã‚°ãƒ¬ãƒ¼ã‚¹ã€ãƒ™ã‚¤ãƒ“ãƒ¼ï¼å¤å…¸çš„ãªã‚¯ãƒ©ã‚·ãƒƒã‚¯ã‹ã‚‰æœªæ¥çš„ãªãƒ“ãƒ¼ã‚¹ãƒˆã¾ã§ã€æœ€ã‚‚ã‚¯ãƒ¼ãƒ«ã§é€Ÿã„è»Šã¨ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚¹ã§ãã¾ã™ã€‚ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚·ãƒ•ãƒˆã‚’ãƒžã‚¹ã‚¿ãƒ¼ã—ã€ãƒ‹ãƒˆãƒã‚’è³¢ãä½¿ã£ã¦ç«¶äº‰ã‚’æ‰“ã¡ç ´ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚¹ã‚²ãƒ¼ãƒ ã¯ãã®ãƒªã‚¢ãƒ«ãªç‰©ç†å¦ã¨ç´ æ™´ã‚‰ã—ã„ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚¹ã§ã‚ãªãŸã®å¿ƒã‚’çˆ†ç™ºã•ã›ã¾ã™ã€‚ã“ã‚Œã¾ã§ãƒ—ãƒ¬ã‚¤ã—ãŸã“ã¨ã®ãªã„ã‚ˆã†ãªã‚‚ã®ã§ã™ã€‚ GT Nitroã¯ã€ãƒªãƒ•ãƒ¬ãƒƒã‚¯ã‚¹ã¨ã‚¿ã‚¤ãƒŸãƒ³ã‚°ã‚’è©¦ã™ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚¹ã‚²ãƒ¼ãƒ ã§ã™ã€‚æ£ã—ã„çž¬é–“ã«ã‚®ã‚¢ã‚’ã‚·ãƒ•ãƒˆã—ã€ã‚¬ã‚¹ã‚’æ€ã„åˆ‡ã‚Šè¸ã‚€å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€å¤§ç‰©ãŸã¡ã¨ç«¶ã„ã¤ã¤ã€è»Šã®ãƒãƒ¥ãƒ¼ãƒ‹ãƒ³ã‚°ã¨ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã‚‚è¡Œã‚ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ã€‚ä¸–ç•Œä¸ã§æœ€é«˜ã®ãƒ‰ãƒ©ã‚¤ãƒãƒ¼ã¨è»Šã¨ã‚«ãƒ¼ãƒ¬ãƒ¼ã‚¹ã«æŒ‘ã‚€ã“ã¨ã«ãªã‚Šã€ãƒ‰ãƒ©ãƒƒã‚°ãƒ¬ãƒ¼ã‚¹ã®çŽ‹å†
starsky5 2009/03/11
algorithm

c++

diff

programming

tips
ãƒªãƒ³ã‚¯
GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ - bkãƒ–ãƒã‚°
GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ æœ€è¿‘ã«ãªã£ã¦ GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ã‚’2ã¤çŸ¥ã‚Šã¾ã—ãŸã€‚èª¿ã¹ã¦ã¿ã‚‹ã¨ã€ã„ãšã‚Œã‚‚æ˜”ã‹ã‚‰ã‚ã‚‹æ©Ÿèƒ½ã§ã—ãŸã€‚ --side-by-side ã¯2æ®µçµ„ã§çµæžœã‚’è¡¨ç¤ºã™ã‚‹ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ã€‚å¤‰æ›´ã•ã‚Œã¦ã„ãªã„è¡Œã‚’å«ã‚ã¦2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…å®¹å…¨ä½“ã¨å¤‰æ›´ç‚¹ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã®ãŒãƒã‚¤ãƒ³ãƒˆã§ã™ã€‚å¤‰æ›´ã•ã‚ŒãŸè¡Œã®å‰å¾Œæ•°è¡Œã ã‘ã§ãªããƒ•ã‚¡ã‚¤ãƒ«å…¨ä½“ã‚’ã¾ã¨ã‚ã¦èªã¿ãŸã„ã¨ãã«ä½¿ãˆã¾ã™ã€‚ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¡¨ç¤ºã®æ¨ªå¹…ã¯130æ–‡å—ã§ã™ã€‚å¿…è¦ã«å¿œã˜ã¦ --width ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§å¤‰æ›´ã§ãã¾ã™ã€‚ ã“ã†ã„ã£ãŸç”¨é€”ã«ã¯ meld ãªã©ã® GUI ã® diff ãƒ„ãƒ¼ãƒ«ã‚’ä½¿ãˆã°ã„ã„ã®ã§ã™ãŒã€ ssh ç«¯æœ«ã—ã‹ãªã„ã‚ˆã†ãªçŠ¶æ³ã§é‡å®ã—ã¾ã™ã€‚ --strip-trailing-cr ã¯è¡Œæœ«ã® CR ã‚’ç„¡è¦–ã™ã‚‹æ©Ÿèƒ½ã§ã™ã€‚æ”¹è¡Œã‚³ãƒ¼ãƒ‰ãŒ CRLF ã¨ LF ã§é£Ÿã„é•ã£ã¦ã„ã‚‹ã‘ã©ã€ä¸èº«ã¯ã»ã¼åŒã˜ã€ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã™
starsky5 2009/03/11
diff

command

programming

tips
ãƒªãƒ³ã‚¯
Manpage of DIFF3
Section: User Commands (1) Updated: October 2002 Index JM Home Page roff page åå‰ diff3 - 3 ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«é–“ã«ã‚ã‚‹é•ã„ã‚’æŽ¢ã™ æ›¸å¼ diff3 [-3aeimxAETX] [-L LABEL] [--easy-only] [--ed] [--initial-tab] [--label=LABEL] [--merge] [--overlap-only] [--show-all] [--show-overlap] [--text] MINE OLDER YOUR diff3 [-v] [--help] [--version] èª¬æ˜Ž diff3 ã¯ 3 ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã—ã€ãã‚Œã‚‰ã®é•ã„ã®èª¬æ˜Žã‚’å‡ºåŠ›ã™ã‚‹ã€‚ æ¯”è¼ƒå¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ MINE, OLDER, YOURS ã§ã‚ã‚‹ã€‚ã“ã‚Œã‚‰ä¸‰ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã†ã¡ã®ä¸€ã¤
starsky5 2009/03/11
command

diff
ãƒªãƒ³ã‚¯
patch/diff Tips
Copyright (c) 2001 Koichi OKADA ã¾ãšã€Œå–æ‰±èª¬æ˜Žæ›¸ã€ã‚’ãŠèªã¿ãã ã•ã„ã€‚ ã¯ã˜ã‚ã« diff/patch ã¨ã¯ diff ã¨ã„ã†ã®ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’ä½œæˆã™ã‚‹ãƒ„ãƒ¼ãƒ«ã€ patch ã¨ã„ã†ã®ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’å†ç¾ã™ã‚‹ãƒ„ãƒ¼ãƒ«ã§ã™ã€‚ é€šå¸¸ diff ã§ä½œã£ãŸå·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒ‘ãƒƒãƒ(ã°ã‚“ãã†ã“ã†)ã¨å‘¼ã³ã¾ã™ã€‚ ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ å¤šåˆ†ã€æ°—ã«ã—ãªãã¦è‰¯ã„ã§ã™ã€‚ æº–å‚™ UNIX ã®å ´åˆ é€šå¸¸ UNIX ã«ã¯ diff ã¨ patch ã¯æ¨™æº–ã§å…¥ã£ã¦ã„ã¾ã™ã€‚ ç‰¹ã«æº–å‚™ã¯ã„ã‚‰ãªã„ã¯ãšã§ã™ã€‚ Windows ã®å ´åˆ ä¸€ç•ªæ‰‹ã£å–ã‚Šæ—©ã„ã®ã¯cygwinã‚’å…¥ã‚Œã‚‹ã“ã¨ã§ã™ã€‚ cygwin ã¯ã§ã‹éŽãŽã‚‹ã¨ã‹ cygwin ã¯ã¡ã‚‡ã£ã¨ã£ã¦è¨€ã†äººã¯ vectorè¾ºã‚Šã§ win32 native ãª rcs/diff ã¨ patch ã‚’ å–ã£ã¦æ¥ã‚‹
starsky5 2009/03/06
command

development

programming

tips

diff

patch
ãƒªãƒ³ã‚¯
1