diff --git a/README.md b/README.md index 71afad1..9690de9 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,4 @@ * .gitignore templates for various programming languages and operating systems: https://github.com/github/gitignore +* merge visualization tools: https://stackoverflow.com/questions/137102/whats-the-best-visual-merge-tool-for-git