{"id":326,"date":"2005-03-28T02:00:00","date_gmt":"2005-03-27T17:00:00","guid":{"rendered":"https:\/\/ecoop.net\/memo\/2005-03-28-2.html"},"modified":"2005-03-28T02:00:00","modified_gmt":"2005-03-27T17:00:00","slug":"2005-03-28-2","status":"publish","type":"post","link":"https:\/\/www.ecoop.net\/memo\/archives\/2005-03-28-2.html","title":{"rendered":"emacs \u3067 diff"},"content":{"rendered":"<p>\n&lt;<a href=\"http:\/\/www.math.s.chiba-u.ac.jp\/~matsu\/emacs\/emacs20\/ediff.html\">http:\/\/www.math.s.chiba-u.ac.jp\/~matsu\/emacs\/emacs20\/ediff.html<\/a>><br \/>\n&#8211; Emacs \u6d3b\u7528\u6cd5: Ediff \u306e\u4f7f\u3044\u65b9<br \/>\nM-x ediff-merge \u3068\u3057\u3066\u3001\u4e8c\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u4e8b\u3067\u53ef\u80fd\u3002\u305d\u306e\u307e\u307e\u30de\u30fc\u30b8\u304c\u3067\u304d\u308b\u306e\u3067\u4fbf\u5229\u305d\u3046\u3002<br \/>\nM-x ediff-files \u3067\u4e3b\u306b\u7247\u65b9\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u3059\u308b\u3068\u304b\u3002<br \/>\n\u7d42\u308f\u3063\u305f\u3089 q \u3067\u9589\u3058\u3066 ediff-merge \u30d0\u30c3\u30d5\u30a1\u3092\u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u4fdd\u5b58\u3059\u308c\u3070\u3044\u3044\u3002\u3084\u3081\u305f\u304f\u306a\u3063\u305f\u3089 C-] \u3002<br \/>\n&nbsp;<br \/>\nInfo -> Emacs -> Emerge \u306e\u9805\u76ee\u306b\u305d\u306e\u4ed6\u30b3\u30de\u30f3\u30c9\u7b49\u306e\u8aac\u660e\u304c\u3042\u308b\u3089\u3057\u3044\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>&lt;http:\/\/www.math.s.chiba-u.ac.jp\/~matsu\/emacs\/emacs20\/ediff.html> &#8211; Emacs \u6d3b\u7528\u6cd5: Ediff \u306e\u4f7f\u3044\u65b9 M-x ediff-m &hellip; <a href=\"https:\/\/www.ecoop.net\/memo\/archives\/2005-03-28-2.html\" class=\"more-link\">\u7d9a\u304d\u3092\u8aad\u3080 <span class=\"screen-reader-text\">emacs \u3067 diff<\/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":[],"tags":[48],"class_list":["post-326","post","type-post","status-publish","format-standard","hentry","tag-emacs"],"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/posts\/326","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=326"}],"version-history":[{"count":0,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/posts\/326\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/media?parent=326"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/categories?post=326"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.ecoop.net\/memo\/wp-json\/wp\/v2\/tags?post=326"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}