Commit f7fc7324 authored by norvell's avatar norvell
Browse files

Simplify set-merge-config anchor

parent 09f63f81

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ stages: 
# These can be used later on to do common tasks



.set-merge-config: &set-merge-config

  - git config set merge.renormalize || true

  - git config --local merge.renormalize true || true

  - git config --local merge.renormalize true



# Prints useful information for every job and should be used at the beginning of each job

.print-common-info: &print-common-info