Auto detect and merge lockfile conflicts#3544

Merged

cpojer merged 4 commits intomasterfrom lockfile-conflicts

Jul 7, 2017

+226-28

Commits on Jul 7, 2017

auto detect and merge lockfile conflicts

Sebastian McKenzie
authored and
cpojer
committed
Skip over common ancestors when using diff3.
cpojer
committed
Small code cleanups
cpojer
committed
Nits
cpojer
committed