gistfile1.txt

zoffix@VirtualBox:/tmp/tmp.dLu8TPlBDR$ git pull --rebase https://github.com/MoarVM/MoarVM/
From https://github.com/MoarVM/MoarVM
 * branch            HEAD       -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: first prototype of a per-line coverage reporter
Using index info to reconstruct a base tree...
M       build/Makefile.in
M       lib/MAST/Ops.nqp
M       src/core/frame.c
M       src/core/interp.c
M       src/core/oplabels.h
M       src/core/oplist
M       src/core/ops.c
M       src/core/ops.h
M       src/moar.c
M       src/moar.h
Falling back to patching base and 3-way merge...
Auto-merging src/moar.h
Auto-merging src/moar.c
Auto-merging src/core/ops.h
CONFLICT (content): Merge conflict in src/core/ops.h
Auto-merging src/core/ops.c
CONFLICT (content): Merge conflict in src/core/ops.c
Auto-merging src/core/oplist
Auto-merging src/core/oplabels.h
Auto-merging src/core/interp.c
CONFLICT (content): Merge conflict in src/core/interp.c
Auto-merging src/core/frame.c
Auto-merging lib/MAST/Ops.nqp
CONFLICT (content): Merge conflict in lib/MAST/Ops.nqp
Auto-merging build/Makefile.in
error: Failed to merge in the changes.
Patch failed at 0001 first prototype of a per-line coverage reporter
The copy of the patch that failed is found in: .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".

zoffix@VirtualBox:/tmp/tmp.dLu8TPlBDR$