{"id":2233,"date":"2012-02-14T23:59:32","date_gmt":"2012-02-14T14:59:32","guid":{"rendered":"http:\/\/oichinote.com\/plus\/2012\/02\/14\/mac%e3%81%a7%e3%82%b0%e3%83%a9%e3%83%95%e3%82%a3%e3%82%ab%e3%83%ab%e3%81%ab%e3%83%95%e3%82%a1%e3%82%a4%e3%83%ab%e3%81%ae%e5%b7%ae%e5%88%86%e3%82%92%e3%83%81%e3%82%a7%e3%83%83%e3%82%af%e3%81%99\/"},"modified":"2012-02-14T23:59:32","modified_gmt":"2012-02-14T14:59:32","slug":"mac-1711","status":"publish","type":"post","link":"https:\/\/oichinote.com\/plus\/2012\/02\/mac-1711.html","title":{"rendered":"Mac\u3067\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u306b\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u30c1\u30a7\u30c3\u30af\u3059\u308b\u65b9\u6cd5"},"content":{"rendered":"<p>\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u53d6\u308b\u306e\u306b\u3001\u4eca\u307e\u3067\u3001emacs\u306eediff\u3092\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u3002emacs\u306e\u30d0\u30c3\u30d5\u30a1\u540c\u58eb\u3092\u6bd4\u8f03\u3057\u3066\u3001\u5dee\u5206\u306e\u78ba\u8a8d\u3068\u4fee\u6b63\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u4f7f\u3044\u65b9\u306f\u3001\u6b21\u306e\u901a\u308a\u3067\u3059\u3002<\/p>\n<ol>\n<li>\u6bd4\u8f03\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u4e8c\u3064\u3092\u958b\u304f<\/li>\n<li>ESC-x ediff-buffers<\/li>\n<li>Buffer A\u3068Buffer B\u3092\u6307\u5b9a<\/li>\n<li>Space\u3092\u62bc\u3059\u5ea6\u306b\u5dee\u5206\u500b\u6240\u8868\u793a<\/li>\n<\/ol>\n<p><img decoding=\"async\" border=\"0\" alt=\"20120214ediff\" src=\"https:\/\/oichinote.com\/plus\/files\/img\/20120214ediff.png\" \/>\n<\/p>\n<p>\u8d64\u67a0\u306f\u3001\u500b\u4eba\u60c5\u5831\u306a\u306e\u3067\u3001\u5f8c\u3067\u8ffd\u52a0\u3057\u305f\u90e8\u5206\u3067\u3059\u3002<\/p>\n<p>\u7dd1\u3001\u9ec4\u8272\u3001\u30b0\u30ec\u30fc\u3067\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u90e8\u5206\u304c\u3001\u5dee\u5206\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u521d\u3081\u3066\u3053\u306e\u6a5f\u80fd\u3092\u77e5\u3063\u305f\u6642\u306f\u3001\u611f\u52d5\u3067\u3057\u305f\u3002<\/p>\n<p>\u3068\u3053\u308d\u304c\u6700\u8fd1\u3001\u3082\u3063\u3068\u3059\u3054\u3044\u65b9\u6cd5\u3092\u77e5\u3063\u305f\u306e\u3067\u3059\u3002<\/p>\n<p>Mac OS X\u9650\u5b9a\u3067\u3059\u3051\u308c\u3069\u3001opendiff\u304b\u3089\u547c\u3073\u51fa\u3055\u308c\u308bFileMerge.app\u306b\u3088\u308b\u6bd4\u8f03\u753b\u9762\u304c\u3059\u3054\u3044\u306e\u3067\u3059\u3002<\/p>\n<p>\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3067\u8d77\u52d5\u3057\u307e\u3059\u3002<\/p>\n<pre>$ opendiff yoruho.pl yoruho.pl~<\/pre>\n<p>\u3059\u308b\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u304cascii\u3058\u3083\u306a\u3044\u3051\u3069\u3001FileMerge.app\u3067\u958b\u304f\u304b\u3068\u8a00\u3046\u3001\u78ba\u8a8d\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u958b\u304d\u307e\u3059\u3002<\/p>\n<p><img decoding=\"async\" border=\"0\" alt=\"20120414opendiff1\" src=\"https:\/\/oichinote.com\/plus\/files\/img\/20120414opendiff1.png\" \/><\/p>\n<p>\u69cb\u308f\u305a\u3001&quot;Proceed anyway&quot;\u3092\u62bc\u3059\u3068\u3001FileMerge.app\u304c\u8d77\u52d5\u3057\u307e\u3059\u3002<\/p>\n<p><img decoding=\"async\" border=\"0\" alt=\"20120214opendiff\" src=\"https:\/\/oichinote.com\/plus\/files\/img\/20120214opendiff.png\" \/><\/p>\n<p>\u5dee\u5206\u304c\u4e00\u767a\u3067\u308f\u304b\u308a\u307e\u3059\u3002\u3057\u304b\u3082\u3001\u30b9\u30af\u30ed\u30fc\u30eb\u3059\u308b\u306e\u306b\u5408\u308f\u305b\u3066\u3001\u5dee\u5206\u500b\u6240\u3082\u7740\u3044\u3066\u304d\u307e\u3059\u3002<\/p>\n<p>FileMerge.app\u306f\u3001Xcode\u306e\u4e00\u90e8\u306a\u306e\u3067\u3001Xcode\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304a\u304f\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u6b21\u306e\u6240\u3067\u3001\u7c21\u5358\u306b\u8aac\u660e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u3044\u307e\u3059\u3002<\/p>\n<ul>\n<li><a href=\"http:\/\/suin.asia\/2011\/03\/05\/mac_opendiff\" target=\"_blank\">\u30bf\u30fc\u30df\u30ca\u30eb\u304b\u3089\u306e\u5dee\u5206\u78ba\u8a8d\u306bMac\u306eopendiff\u304c\u4fbf\u5229\u306a\u4ef6 | Suinasia<\/a><\/li>\n<\/ul>\n<p>\u66f4\u306b\u524d\u306e\u8a71\u3067\u3059\u304c\u3001sdiff\u3068\u8a00\u3046\u30b3\u30de\u30f3\u30c9\u3092\u77e5\u3063\u305f\u6642\u3082\u611f\u52d5\u7684\u3067\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u3092\u5de6\u53f3\u4e8c\u3064\u306b\u4e26\u3079\u3066\u3001\u884c\u304c\u9055\u3046\u6240\u306b\u3001\u30de\u30fc\u30af\u304c\u4ed8\u304f\u306e\u3067\u3059\u3002<\/p>\n<pre>$ sdiff yoruho.pl yoruho.pl~ | less<\/pre>\n<p><img decoding=\"async\" border=\"0\" alt=\"20120214sdiff\" src=\"https:\/\/oichinote.com\/plus\/files\/img\/20120214sdiff.png\" \/><\/p>\n<p>\u9752\u67a0\u3067\u793a\u3057\u305f\u90e8\u5206\u306b\u3001&quot;|&quot;\u3068\u304b&quot;&lt;&quot;\u3068\u304b&quot;&gt;&quot;\u304c\u4ed8\u304d\u307e\u3059\u3002<\/p>\n<p>sdiff\u306f\u3001\u3069\u3093\u306a\u74b0\u5883\u3067\u3082\u4f7f\u3048\u308b\u306e\u3067\u4fbf\u5229\u3067\u3059\u3002<\/p>\n<p>(\u8ffd\u8a18 2012-03-13 00:08)<\/p>\n<p>\u6700\u8fd1\u306ediff\u3060\u3068\u3001&quot;-y&quot;\u30aa\u30d7\u30b7\u30e7\u30f3\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<pre>$ diff -y yoruho.pl yoruho.pl~ | less<\/pre>\n<p>sdiff\u3068\u540c\u69d8\u306e\u7d50\u679c\u304c\u5f97\u3089\u308c\u307e\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u53d6\u308b\u306e\u306b\u3001\u4eca\u307e\u3067\u3001emacs\u306eediff\u3092\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u3002emacs\u306e\u30d0\u30c3\u30d5\u30a1\u540c\u58eb\u3092\u6bd4\u8f03\u3057\u3066\u3001\u5dee\u5206\u306e\u78ba\u8a8d\u3068\u4fee\u6b63\u304c\u3067\u304d\u307e\u3059\u3002 \u4f7f\u3044\u65b9\u306f\u3001\u6b21\u306e\u901a\u308a\u3067\u3059\u3002 \u6bd4\u8f03\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u4e8c\u3064\u3092\u958b\u304f ESC-x ediff-b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":21730,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_feature_clip_id":0,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"\u65b0\u3057\u3044\u8a18\u4e8b\u300eMac\u3067\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u306b\u30d5\u30a1\u30a4\u30eb\u306e\u5dee\u5206\u3092\u30c1\u30a7\u30c3\u30af\u3059\u308b\u65b9\u6cd5\u300f\u3092\u6295\u7a3f\u3057\u307e\u3057\u305f\u3002\u8aad\u3093\u3067\u3044\u305f\u3060\u3051\u308b\u3068\u5b09\u3057\u3044\u3067\u3059\u3002","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2},"jetpack_post_was_ever_published":false},"categories":[5],"tags":[],"class_list":["post-2233","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-computer"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"https:\/\/oichinote.com\/plus\/files\/2017\/09\/20120214ediff.png","jetpack-related-posts":[{"id":1603,"url":"https:\/\/oichinote.com\/plus\/2010\/05\/macportsffmpegb.html","url_meta":{"origin":2233,"position":0},"title":"MacPorts\u3067ffmpeg\u3092build\u3057\u307e\u3057\u305f[\u8ffd\u8a18\u3042\u308a]","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2010\u5e745\u670828\u65e5","format":false,"excerpt":"radiko\u3092rtmpdump\u3067\u9332\u97f3\u3057\u305fflv\u3092mp3\u306b\u5909\u63db\u3059\u308b\u70ba\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f\u3002 \u6b21\u306e\u8a18\u4e8b\u2026","rel":"","context":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","block_context":{"text":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","link":"https:\/\/oichinote.com\/plus\/category\/computer"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":1083,"url":"https:\/\/oichinote.com\/plus\/2008\/12\/ver14-5ebe.html","url_meta":{"origin":2233,"position":1},"title":"\u5b9b\u540d\u8077\u4ebaVer.14\u306b\u5f15\u3063\u8d8a\u3057\u307e\u3057\u305f","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2008\u5e7412\u670830\u65e5","format":false,"excerpt":"\u6628\u65e5\u3001\u5e74\u8cc0\u72b6\u3092\u51fa\u3057\u7d42\u308f\u308a\u307e\u3057\u305f\u3002\u5b9b\u540d\u5370\u5237\u306f\u3001\u7d50\u5c40\u3001\u5b9b\u540d\u8077\u4ebaVer.14\u3067\u3057\u307e\u3057\u305f\u3002 \u79c1\u306f\u3001\u5b9b\u540d\u8077\u4ebaV\u2026","rel":"","context":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","block_context":{"text":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","link":"https:\/\/oichinote.com\/plus\/category\/computer"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":15650,"url":"https:\/\/oichinote.com\/plus\/2015\/07\/corruppted-japanese-on-emacs-shell-mode-from-launchpad.html","url_meta":{"origin":2233,"position":2},"title":"OS X\u306eFinder\u304b\u3089Emacs\u3092\u8d77\u52d5\u3059\u308b\u3068\u65e5\u672c\u8a9e\u304c\u5316\u3051\u308b","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2015\u5e747\u670829\u65e5","format":false,"excerpt":"\u8d85\u9593\u629c\u3051\u306a\u8a71\u306a\u306e\u3067\u3059\u304c\u3001\u805e\u3044\u3066\u3044\u305f\u3060\u3051\u307e\u3059\u3067\u3057\u3087\u3046\u304b? \u5148\u65e5\u3001Homebrew\u3067Emacs\u3092\u30a4\u30f3\u30b9\u30c8\u2026","rel":"","context":"Mac","block_context":{"text":"Mac","link":"https:\/\/oichinote.com\/plus\/category\/mac"},"img":{"alt_text":"Emacs\u306eShell\u30e2\u30fc\u30c9","src":"https:\/\/i0.wp.com\/oichinote.com\/plus\/files\/2015\/07\/20150729emacs-shell.png?resize=350%2C200&ssl=1","width":350,"height":200},"classes":[]},{"id":2265,"url":"https:\/\/oichinote.com\/plus\/2012\/03\/os-x-lionword-4.html","url_meta":{"origin":2233,"position":3},"title":"OS X Lion\u306bWordPress\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb(5\/5)","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2012\u5e743\u670817\u65e5","format":false,"excerpt":"\u4eca\u5e74\u306e\u76ee\u6a19\u306e\u4e00\u3064\u306f\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u3068\u30d6\u30ed\u30b0\u306e\u7d71\u5408\u3067\u3059\u3002 2012\u5e74\u8b39\u8cc0\u65b0\u5e74\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u7d71\u5408\u5316\u306b\u5411\u3051\u3066\u2026","rel":"","context":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","block_context":{"text":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","link":"https:\/\/oichinote.com\/plus\/category\/computer"},"img":{"alt_text":"","src":"https:\/\/i0.wp.com\/oichinote.com\/plus\/files\/2017\/09\/20120317wpconfig_s.png?resize=350%2C200&ssl=1","width":350,"height":200},"classes":[]},{"id":2260,"url":"https:\/\/oichinote.com\/plus\/2012\/03\/os-x-lionword-2.html","url_meta":{"origin":2233,"position":4},"title":"OS X Lion\u306bWordPress\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb(3\/5)","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2012\u5e743\u670812\u65e5","format":false,"excerpt":"\u4eca\u5e74\u306e\u76ee\u6a19\u306e\u4e00\u3064\u306f\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u3068\u30d6\u30ed\u30b0\u306e\u7d71\u5408\u3067\u3059\u3002 2012\u5e74\u8b39\u8cc0\u65b0\u5e74\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u7d71\u5408\u5316\u306b\u5411\u3051\u3066\u2026","rel":"","context":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","block_context":{"text":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","link":"https:\/\/oichinote.com\/plus\/category\/computer"},"img":{"alt_text":"","src":"https:\/\/i0.wp.com\/oichinote.com\/plus\/files\/2017\/09\/20120312phpopendiff2.png?resize=350%2C200&ssl=1","width":350,"height":200},"classes":[]},{"id":2255,"url":"https:\/\/oichinote.com\/plus\/2012\/03\/wordpress.html","url_meta":{"origin":2233,"position":5},"title":"OS X Lion\u306bWordPress\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb(2\/5)","author":"\u304a\u5e02\u306e\u304b\u305f","date":"2012\u5e743\u67087\u65e5","format":false,"excerpt":"\u4eca\u5e74\u306e\u76ee\u6a19\u306e\u4e00\u3064\u306f\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u3068\u30d6\u30ed\u30b0\u306e\u7d71\u5408\u3067\u3059\u3002 2012\u5e74\u8b39\u8cc0\u65b0\u5e74\u3001\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u7d71\u5408\u5316\u306b\u5411\u3051\u3066\u2026","rel":"","context":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","block_context":{"text":"\u30d1\u30bd\u30b3\u30f3\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8","link":"https:\/\/oichinote.com\/plus\/category\/computer"},"img":{"alt_text":"","src":"https:\/\/i0.wp.com\/oichinote.com\/plus\/files\/2017\/09\/20120307mysql5.png?resize=350%2C200&ssl=1","width":350,"height":200},"classes":[]}],"jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/posts\/2233","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/comments?post=2233"}],"version-history":[{"count":0,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/posts\/2233\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/media\/21730"}],"wp:attachment":[{"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/media?parent=2233"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/categories?post=2233"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/oichinote.com\/plus\/wp-json\/wp\/v2\/tags?post=2233"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}