HomeSort by relevance Sort by last modified time
    Searched full:merge_msg (Results 1 - 1 of 1) sorted by null

  /prebuilts/devtools/
update_jars.sh 13 MK_MERGE_MSG="1" # 1 to update the MERGE_MSG, empty to do not generate it
14 MERGE_MSG="" # msg to generate
33 echo " -m: do NOT generate a .git/MERGE_MSG"
53 MERGE_MSG="$MERGE_MSG
59 function merge_msg() { function
60 local dst=.git/MERGE_MSG
68 $MERGE_MSG
150 if [[ -n $MK_MERGE_MSG ]]; then merge_msg; fi

Completed in 70 milliseconds