{"blog_title":"\u4f5c\u696d\u30ce\u30fc\u30c8","url":"https://te2u.hatenablog.jp/entry/2012/07/02/234314","title":"git\u3067vimdiff\u3092\u4f7f\u3046","type":"rich","image_url":null,"height":"190","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fte2u.hatenablog.jp%2Fentry%2F2012%2F07%2F02%2F234314\" title=\"git\u3067vimdiff\u3092\u4f7f\u3046 - \u4f5c\u696d\u30ce\u30fc\u30c8\" 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":"te2u","provider_url":"https://hatena.blog","published":"2012-07-02 23:43:14","blog_url":"https://te2u.hatenablog.jp/","description":"git\u3067\u5dee\u5206\u3092\u898b\u308b\u3068\u304d\u306bvimdiff\u3092\u4f7f\u3046\u65b9\u6cd5\u3002 git config --global diff.tool vimdiffgit config --global merge.tool vimdiffgit config --global difftool.prompt falsegit config --global alias.dt difftoolgit config --global alias.mt mergetool \u6700\u521d\u306e2\u3064\u304cdifftool\u3001mergetool\u3067vimdiff\u3092\u4f7f\u7528\u3059\u308b\u70ba\u306e\u8a2d\u5b9a\u3002 3\u3064\u3081\u306f\u3001difftool\u3092\u5b9f\u884c\u3057\u305f\u3068\u304d\u8868\u793a\u3055\u308c\u308b\u30d7\u30ed\u30f3\u30d7\u30c8\u3092\u8868\u793a\u3057\u306a\u3044\u3088\u3046\u306b\u2026","width":"100%","author_url":"https://blog.hatena.ne.jp/te2u/","provider_name":"Hatena Blog","categories":["git"],"version":"1.0"}