swcarpentry/bc — pull request #720 by strootman (2014-09-17 02:45:20+00:00)
Title: Adding git graphical diff/merge tool lesson

Added a lesson for integrating _DiffMerge_ into Git's `difftool` and `diffmerge` commands.
We've attempted to follow the sample repos/examples created in the previous lessons.