Configure `merge=union` for `changelog.txt` to reduce merge conflicts#381

myk002 merged 1 commit intoDFHack:masterDFHack/scripts:masterfrom

TymurGubayev:patch-5TymurGubayev/scripts:patch-5Copy head branch name to clipboard