Unit tests for added merging functionality#31

jankowtf wants to merge 1 commit into

rstudio:masterrstudio/config:masterfrom

jankowtf:patch-2jankowtf/config:patch-2Copy head branch name to clipboard