{"id":919,"date":"2010-04-22T01:00:00","date_gmt":"2010-04-21T16:00:00","guid":{"rendered":"https:\/\/ecoop.net\/memo\/2010-04-22-1.html"},"modified":"2017-04-20T18:02:18","modified_gmt":"2017-04-20T09:02:18","slug":"2010-04-22-1","status":"publish","type":"post","link":"https:\/\/www.ecoop.net\/memo\/archives\/2010-04-22-1.html","title":{"rendered":"diff \u306e\u7d50\u679c\u3092\u8272\u4ed8\u3059\u308b"},"content":{"rendered":"

\nvim \u306b\u7d50\u679c\u3092\u6e21\u3059\u3068\u3001diff \u306e\u8868\u793a\u304c\u8272\u5206\u3051\u8868\u793a\u306b\u306a\u3063\u3066\u8aad\u307f\u3084\u3059\u304f\u306a\u308a\u307e\u3059\u3002<\/p>\n

diff -u old.txt new.txt | vim -R –\n<\/p><\/blockquote>\n

 diff -u \u306f\u597d\u304d\u306a\u66f8\u5f0f\u6307\u5b9a\u3067\u5927\u4e08\u592b\u3067\u3059\u3002
\n 
\n\u4ed6\u306b\u3082\u3001[[ColorDiff http:\/\/colordiff.sourceforge.net\/<\/a>]](FreeBSD ports: textproc\/colordiff)\u3068\u3044\u3046\u3082\u306e\u3082\u3042\u308a\u307e\u3059\u3002
\n 
\n\u53c2\u8003:
\n– [[diff\u306e\u7d50\u679c\u3092vim\u3067\u8272\u4ed8\u3051\u3057\u3066\u8868\u793a\u3059\u308b\u30b0\u30ed\u30fc\u30d0\u30eb\u30a8\u30a4\u30ea\u30a2\u30b9http:\/\/d.hatena.ne.jp\/ysano2005\/20061102\/1162445347<\/a>]]
\n  zsh \u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30a8\u30a4\u30ea\u30a2\u30b9\u7248\u3068\u3001\u305d\u306e\u4ed6\u306e\u65b9\u6cd5\u304c\u7d39\u4ecb\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"

vim \u306b\u7d50\u679c\u3092\u6e21\u3059\u3068\u3001diff \u306e\u8868\u793a\u304c\u8272\u5206\u3051\u8868\u793a\u306b\u306a\u3063\u3066\u8aad\u307f\u3084\u3059\u304f\u306a\u308a\u307e\u3059\u3002 diff -u old.txt new.txt | vim -R –  diff -u \u306f\u597d\u304d\u306a\u66f8\u5f0f\u6307\u5b9a\u3067\u5927\u4e08\u592b\u3067\u3059 … \u7d9a\u304d\u3092\u8aad\u3080 diff \u306e\u7d50\u679c\u3092\u8272\u4ed8\u3059\u308b<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[135],"tags":[20],"class_list":["post-919","post","type-post","status-publish","format-standard","hentry","category-server","tag-linux"],"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/posts\/919","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/comments?post=919"}],"version-history":[{"count":0,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/posts\/919\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/media?parent=919"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/categories?post=919"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/tags?post=919"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}