{"author_url":"https://blog.hatena.ne.jp/Kenji_s/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fkenji-s.hatenadiary.org%2Fentry%2F20110305%2F1299299143\" title=\" Mercurial \u3067\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u306b Meld \u3092\u4f7f\u3046 - A Day in Serenity @ kenjis\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_name":"Kenji_s","height":"190","type":"rich","version":"1.0","categories":["Mercurial","Ubuntu"],"provider_url":"https://hatena.blog","blog_title":"A Day in Serenity @ kenjis","title":" Mercurial \u3067\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u306b Meld \u3092\u4f7f\u3046","image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/K/Kenji_s/20110305/20110305131339.png","provider_name":"Hatena Blog","published":"2011-03-05 13:25:43","blog_url":"https://kenji-s.hatenadiary.org/","description":"kdiff3 \u306f\u65e5\u672c\u8a9e\u306e\u7de8\u96c6\u306b\u554f\u984c\u304c\u3042\u308a\u3001\u65e5\u672c\u8a9e\u3092\u30de\u30fc\u30b8\u4f5c\u696d\u4e2d\u306b\u7de8\u96c6\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u3001\u4f5c\u696d\u304c\u56f0\u96e3\u3067\u3059\u306e\u3067\u3001\u5225\u306e\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u306b\u5909\u66f4\u3059\u308b\u3053\u3068\u306b\u3057\u307e\u3059\u3002Ubuntu \u306b GUI \u306e\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u3067\u3042\u308b Meld \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3001Mercurial \u306e\u30de\u30fc\u30b8\u3067\u4f7f\u3048\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002 \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb $ sudo apt-get install meld .hgrc \u3067\u306e\u8a2d\u5b9a [ui] merge = meld\u3068\u3057\u307e\u3059\u3002\u3053\u308c\u3067\u5b8c\u4e86\u3067\u3059\u3002 \u30de\u30fc\u30b8\u306e\u4ed5\u65b9 hg merge \u3057\u885d\u7a81\u304c\u3042\u308b\u3068\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b meld \u304c\u8d77\u52d5\u3057\u307e\u3059\u3002 Meld \u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u4e26\u3073\u9806\u306f\u3001local, base, other \u3068\u306a\u3063\u3066\u3044\u2026","width":"100%","url":"https://kenji-s.hatenadiary.org/entry/20110305/1299299143"}