28 July 2016 Smerge-mode Smerge-mode pain reduction for merge conflicts Sorry your browser does not support the video tag, maybe time to upgrade?