Three way merge, including recognition of moves and edit in moves, unlike traditional tools
gem "merge3", "~> 0.9"
