{"provider_name":"Hatena Blog","provider_url":"https://hatena.blog","author_name":"flying-foozy","image_url":null,"height":"190","description":"\u300e*.rej \u30d5\u30a1\u30a4\u30eb\u751f\u6210\u300f\u5f62\u5f0f\u306e\u30de\u30fc\u30b8\u306e\u5b9f\u88c5\u904e\u7a0b\u3067\u5f97\u305f\u77e5\u898b\u306e\u307e\u3068\u3081\u3002\u203b Bitbucket \u4e0a\u3067 hgext-mergebypatch \u3068\u3057\u3066\u516c\u958b\u3057\u3066\u307e\u3059\"mdiff.unidiff()\" \u3068 \"patch.internalpatch()\" \u306e\u7d44\u307f\u5408\u308f\u305b\u3067\u3001\u3068\u308a\u3042\u3048\u305a\u306f\u6240\u671b\u306e\u6a5f\u80fd\u304c\u5b9f\u73fe\u51fa\u6765\u308b\u3053\u3068\u3092\u78ba\u8a8d\u51fa\u6765\u305f\u306e\u3060\u304c\u3001\u6848\u306e\u5b9a\u3068\u8a00\u3046\u304b\u4e88\u5b9a\u901a\u308a\u3068\u8a00\u3046\u304b\u3001rename/copy \u304c\u7d61\u3093\u3060\u30de\u30fc\u30b8\u3060\u3068\u3001\u601d\u3063\u305f\u3088\u3046\u306b\u52d5\u304b\u306a\u3044\u3002rename/copy \u304c\u7d61\u3093\u3060\u30b1\u30fc\u30b9\u3067\u3082\u3001\u300clocal \u5074\u3067\u6539\u540d\u6e08\u307f\u300d\u306e\u5834\u5408\u306f\u4e0a\u624b\u304f\u884c\u304f\u304c\u3001\u300cother \u5074\u3067\u6539\u540d\u300d\u306e\u5834\u5408\u306f\u4e0a\u624b\u304f\u884c\u304b\u306a\u3044\u3002\u5177\u4f53\u7684\u306b\u306f\u3001hunk \u9069\u7528\u51e6\u7406\u307e\u3067\u306f\u8fbf\u308a\u7740\u2026","blog_title":"\u5f77\u5fa8\u3048\u308b\u30d5\u30b8\u30ef\u30e9","title":" \"internal:patch\" \u5b9f\u88c5\u7d4c\u7def\u306e\u30e1\u30e2","categories":["mercurial","hg-hack","hg-merge","hg-merge-tools","tokyomercurial"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fflying-foozy.hatenablog.com%2Fentry%2F20120213%2F1329122722\" title=\" &quot;internal:patch&quot; \u5b9f\u88c5\u7d4c\u7def\u306e\u30e1\u30e2 - \u5f77\u5fa8\u3048\u308b\u30d5\u30b8\u30ef\u30e9\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","published":"2012-02-13 17:45:22","width":"100%","version":"1.0","url":"https://flying-foozy.hatenablog.com/entry/20120213/1329122722","author_url":"https://blog.hatena.ne.jp/flying-foozy/","blog_url":"https://flying-foozy.hatenablog.com/","type":"rich"}