{"categories":[],"author_name":"hydrocul","description":"\u8907\u6570\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u53ef\u80fd\u6027\u306e\u3042\u308b2\u3064\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30eaa\u3068b\u304c\u3042\u3063\u305f\u3068\u3057\u3066\u3001\u305d\u306ediff\u3092\u3059\u308b\u65b9\u6cd5\u3002 diff -urN a b > diff.diff a\u304c\u7de8\u96c6\u524d\u3001b\u304c\u7de8\u96c6\u5f8c\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u3057\u3066\u3001\u7de8\u96c6\u5185\u5bb9\u3092\u8868\u3059diff.diff\u304c\u3068\u308c\u308b\u3002\u62e1\u5f35\u5b50\u3092diff\u306b\u3059\u308b\u3068\u3001Emacs\u3067\u30ab\u30e9\u30fc\u3067\u8868\u793a\u3055\u308c\u308b\u3088\u3046\u3060\u3002\u30aa\u30d7\u30b7\u30e7\u30f3r\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e2d\u306b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u3042\u308b\u5834\u5408\u306b\u5bfe\u5fdc\u3002\u30aa\u30d7\u30b7\u30e7\u30f3N\u306f\u8ffd\u52a0\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3082diff.diff\u306b\u8a18\u9332\u3059\u308b\u305f\u3081\u3002 \u3053\u306ediff.diff\u3092c\u3068\u3044\u3046\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u9069\u7528\u3059\u308b\u65b9\u6cd5\u3002 patch -u -p1 -d c < diff.diff cd c \u3068\u3057\u306a\u304f\u3066\u3082\u3044\u3044\u3088\u3046\u306b -d \u3067\u9069\u2026","blog_title":"hydrocul\u306e\u65e5\u8a18","url":"https://hydrocul.hatenadiary.org/entry/20111223/1324639345","title":"diff\u3068patch\u306e\u4f7f\u3044\u65b9","type":"rich","blog_url":"https://hydrocul.hatenadiary.org/","published":"2011-12-23 20:22:25","provider_url":"https://hatena.blog","version":"1.0","author_url":"https://blog.hatena.ne.jp/hydrocul/","height":"190","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fhydrocul.hatenadiary.org%2Fentry%2F20111223%2F1324639345\" title=\"diff\u3068patch\u306e\u4f7f\u3044\u65b9 - hydrocul\u306e\u65e5\u8a18\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","width":"100%","provider_name":"Hatena Blog","image_url":null}