Added entry for merge-tool artifacts
Merge pull request #4 from jake-bladt/add_mergetool_artifacts

Added entry for merge-tool artifacts