雑u bot . @zatsu, Merging with diff3: the “three-way merge”blog.jcoglan.com/2017/05/08/merging-with-diff3/#ReadItLater Open thread