compare code changes

Merge conflicts do not have to feel like deciphering ancient curses inside your source files. This article...