Fix custom merge function not working#46

Grimones wants to merge 1 commit intojonschlinkert:masterjonschlinkert/set-value:masterfrom

Grimones:patch-1Grimones/set-value:patch-1Copy head branch name to clipboard