2013-12-17 p4mergeをgitのmergetoolにする Setup p4merge as a visual diff and merge tool for ... これをやるだけです。 Perforce Downloads | Perforce ここから最新のp4mergeを落とさないと動かない。 Setup p4merge as a visual diff and merge tool for ...