Merge branch '2.7.x'

This commit is contained in:
Stephane Nicoll 2022-03-20 08:50:25 +01:00
commit 63e8117d49

View File

@ -18,7 +18,7 @@ class ForwardMerge
end
def find_forward_merges(message_file)
$log.debug "Searching for for forward merge"
$log.debug "Searching for forward merge"
rev=`git rev-parse -q --verify MERGE_HEAD`.strip
$log.debug "Found #{rev} from git rev-parse"
return nil unless rev