t / t5100 / msg0006on commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
   1Here is a patch from A U Thor.
   2