Fix typo in forward-merge log message
See gh-30332
This commit is contained in:
committed by
Stephane Nicoll
parent
1f010a7a5e
commit
677787bd0a
@@ -18,7 +18,7 @@ class ForwardMerge
|
|||||||
end
|
end
|
||||||
|
|
||||||
def find_forward_merges(message_file)
|
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
|
rev=`git rev-parse -q --verify MERGE_HEAD`.strip
|
||||||
$log.debug "Found #{rev} from git rev-parse"
|
$log.debug "Found #{rev} from git rev-parse"
|
||||||
return nil unless rev
|
return nil unless rev
|
||||||
|
|||||||
Reference in New Issue
Block a user