Let `git am` to fall back to three way merge during import (#254)
Let `git am` to fall back to three way merge during import (#254)

This allows it to skip duplicate commits due to merge history.

This fixes #251.
tbayaa/lerna,doug-wade/lerna,FaHeymann/lerna,onigoetz/lerna-hg,sveisvei/lerna,lerna/lerna,lerna/lerna,dmfenton/lerna,treshugart/lerna,sebmck/lerna,kittens/lerna,evocateur/lerna,asini/asini,evocateur/lerna,lerna/lerna