{"height":"190","url":"https://te2u.hatenablog.jp/entry/2013/08/02/225140","author_name":"te2u","blog_url":"https://te2u.hatenablog.jp/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fte2u.hatenablog.jp%2Fentry%2F2013%2F08%2F02%2F225140\" title=\"git\u3067vim\u3092\u4f7f\u3063\u3066merge\u3059\u308b - \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>","description":"git merge\u306a\u3069\u3067\u885d\u7a81\u3057\u305f\u3068\u304d\u3001vim\u3092\u4f7f\u3063\u3066\u89e3\u6d88\u3059\u308b\u65b9\u6cd5\u3002 1. mergetool\u3092\u8a2d\u5b9a\u3059\u308b git mergetool\u306e\u8a2d\u5b9a\u3092\u3059\u308b\u3002 $ git config --global mergetool.vimdiff3.cmd 'vimdiff -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"' 2. shell\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u4f5c\u6210\u3059\u308b PATH\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea($HOME/bin\u306a\u3069)\u306b\u3001\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3002 $ vi $HOME/bin/git-vmerge #!/bin/bash set -eu if [ $# -eq\u2026","published":"2013-08-02 22:51:40","version":"1.0","title":"git\u3067vim\u3092\u4f7f\u3063\u3066merge\u3059\u308b","provider_url":"https://hatena.blog","width":"100%","image_url":null,"blog_title":"\u4f5c\u696d\u30ce\u30fc\u30c8","provider_name":"Hatena Blog","categories":["git","Vim"],"author_url":"https://blog.hatena.ne.jp/te2u/","type":"rich"}