t / test4012.pngon commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
t/test4012.png