{"author_url":"https://blog.hatena.ne.jp/am1tanaka/","author_name":"am1tanaka","categories":["mac","Eclipse","EGit"],"title":"mac\u3067Eclipse\u304b\u3089p4merge\u3092\u4f7f\u3048\u308b\u3088\u3046\u306b\u3059\u308b","image_url":null,"url":"https://am1tanaka.hatenablog.com/entry/2014/06/20/104911","description":"\u3053\u3061\u3089\u3092\u53c2\u8003\u306b\u3001mac\u306e\u57fa\u672c\u64cd\u4f5c\u304c\u8272\u3005\u5206\u304b\u3089\u306a\u3044\u306e\u3067\u305d\u306e\u8fba\u3092\u88dc\u8db3\u3002 Git\u306e\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u306bp4merge\u3092\u4f7f\u3063\u3066\u307f\u305f - wadahiro\u306e\u65e5\u8a18 p4merge\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3002\u3053\u308c\u306f\u89e3\u8aac\u306e\u307e\u307e\u306b gitconfig\u306e\u8a2d\u5b9a Finder\u25b6\ufe0e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u25b6\ufe0e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u25b6\ufe0e\u30bf\u30fc\u30df\u30ca\u30eb\u3092\u8d77\u52d5 git config -e --global \u3068\u3057\u3066\u3001\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f [i]\u3067insert\u30e2\u30fc\u30c9\u306b\u79fb\u884c\u3057\u3066\u304b\u3089\u3001\u4ee5\u4e0b\u3092\u8ffd\u52a0(\u53c2\u8003\u30da\u30fc\u30b8\u304b\u3089\u629c\u7c8b) [merge] tool = p4merge [mergetool] keepBackup = false [mergetool \"p4merge\"] pa\u2026","blog_url":"https://am1tanaka.hatenablog.com/","height":"190","width":"100%","provider_url":"https://hatena.blog","version":"1.0","provider_name":"Hatena Blog","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fam1tanaka.hatenablog.com%2Fentry%2F2014%2F06%2F20%2F104911\" title=\"mac\u3067Eclipse\u304b\u3089p4merge\u3092\u4f7f\u3048\u308b\u3088\u3046\u306b\u3059\u308b - tanaka&#39;s Programming Memo\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","published":"2014-06-20 10:49:11","blog_title":"tanaka's Programming Memo","type":"rich"}