summaryrefslogtreecommitdiff
path: root/test/confs/0535
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2018-02-25 02:51:22 -0500
committerPhil Pennock <pdp@exim.org>2018-02-25 02:51:22 -0500
commitb988b06146c5d16e0ca0ea86ffcf2d83938088ed (patch)
tree09e057c4eaca3ab3c1741a1c7475af5b1bbc7484 /test/confs/0535
parente6532c4a78619d4ea45b6e95b738189eebf8859a (diff)
meta: git controls for text changelogs; github controls
For the ChangeLog and files like it, use `merge=union` to bring in content from both sides instead of having conflicts block merges because someone else added a feature. For GitHub, provide some "templates" which really just point people in the right direction, but if the repointing fails, at least reduces the pain a little.
Diffstat (limited to 'test/confs/0535')
0 files changed, 0 insertions, 0 deletions