6 Commits (7.1)

Author SHA1 Message Date
  Leif Åstrand 5a9303869c Commit and push everything before a conflicting commit 11 years ago
  Leif Åstrand d09b586ece Don't start merging if there are uncommitted changes 11 years ago
  Leif Åstrand 888d34c55c Update merge script to merge 7.0 to 7.1 11 years ago
  Artur Signell 5a5066a8c3 Include commit id and message in merge commit message 11 years ago
  Artur Signell 33e114bd3b Ensure no-op merges get a change id 11 years ago
  Artur Signell 1853dea1b9 Script for merging changes from a bugfix branch into master (#11299) 11 years ago