If we use `git config --global merge.conflictstyle diff3`, then Stash still detect conflicts, but with incorrect behavior. Stash not understand diff3 marker for base common ancestor ('|||||| ').