Set merge=union for changelog
Set merge=union for changelog

This will prevent the vast majority of conflicts with this file being
updated concurrently.

bmanikm/PowerShell,JamesWTruher/PowerShell-1,JamesWTruher/PowerShell-1,jsoref/PowerShell,KarolKaczmarek/PowerShell,kmosher/PowerShell,jsoref/PowerShell,jsoref/PowerShell,JamesWTruher/PowerShell-1,kmosher/PowerShell,bingbing8/PowerShell,PaulHigin/PowerShell,PaulHigin/PowerShell,bmanikm/PowerShell,TravisEz13/PowerShell,KarolKaczmarek/PowerShell,bingbing8/PowerShell,TravisEz13/PowerShell,daxian-dbw/PowerShell,daxian-dbw/PowerShell,kmosher/PowerShell,PaulHigin/PowerShell,bingbing8/PowerShell,KarolKaczmarek/PowerShell,daxian-dbw/PowerShell,bmanikm/PowerShell,bingbing8/PowerShell,daxian-dbw/PowerShell,bmanikm/PowerShell,JamesWTruher/PowerShell-1,TravisEz13/PowerShell,PaulHigin/PowerShell,jsoref/PowerShell,kmosher/PowerShell,KarolKaczmarek/PowerShell,KarolKaczmarek/PowerShell,jsoref/PowerShell,TravisEz13/PowerShell,kmosher/PowerShell,bmanikm/PowerShell,bingbing8/PowerShell