garth@garth-desktop:~/cm12$ cd device/samsung/klteusc
garth@garth-desktop:~/cm12/device/samsung/klteusc$ git rebase --abort
garth@garth-desktop:~/cm12/device/samsung/klteusc$ repo sync .
Fetching project Team-Hydra/android_device_samsung_klteusc
Fetching projects: 100% (1/1), done.

project device/samsung/klteusc/
First, rewinding head to replay your work on top of it...
Applying: Add back SamsungQualcommRIL as klteuscRIL
Using index info to reconstruct a base tree...
M	BoardConfig.mk
Falling back to patching base and 3-way merge...
Auto-merging BoardConfig.mk
Applying: klteuscRIL: bring back operatorCheck
Applying: klteuscRIL: add overloaded method for new ril
Applying: Delay SIM status message until after radio is on
Applying: Switch to klteuscRIL
Using index info to reconstruct a base tree...
M	system.prop
Falling back to patching base and 3-way merge...
Auto-merging system.prop
CONFLICT (content): Merge conflict in system.prop
Recorded preimage for 'system.prop'
Failed to merge in the changes.
Patch failed at 0005 Switch to klteuscRIL
The copy of the patch that failed is found in:
   /home/garth/cm12/device/samsung/klteusc/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".