RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
Merge "RepoPick: Actually skip merged commit instead of exiting" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_build into temp