File:Screenshot dev-util meld.png

Summary
Screenshot of a 3-way merge using dev-util/meld