gistfile1.txt

Charless-Mac-Pro:rubinius cremes$ git pull --rebase origin master
From github.com:rubinius/rubinius
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: add basic support for additional IO functions
Applying: add back dup2 function definition
Applying: add convenience methods for errno handling
Applying: add O_CLOEXEC to list for File IO
Applying: add a few more functions like ftruncate to the list
Applying: hack away and rejigger things to get IO booting using mostly FFI calls
Applying: make some fixes to pass more specs
Applying: passes most read specs
Applying: add spec for negative IO#pos when 'unget'ing at start of stream
Applying: more fixes to pass ungetc/ungetbyte/pos/read specs; all pass
Applying: fix #getc to handle encodings properly; passes chars_spec
Applying: fix read_to_separator to handle skipping properly
Applying: specs for requesting a negative-sized pointer which causes SEGV
Applying: return NULL for a MemoryPointer.new with a negative size
Applying: add basic support for additional IO functions =========== WHY IS THIS HERE A SECOND TIME!!!!
Using index info to reconstruct a base tree...
M	kernel/platform/ffi.rb
M	kernel/platform/posix.rb
Falling back to patching base and 3-way merge...
Auto-merging kernel/platform/posix.rb
CONFLICT (content): Merge conflict in kernel/platform/posix.rb
Failed to merge in the changes.
Patch failed at 0015 add basic support for additional IO functions
The copy of the patch that failed is found in:
   /Users/cremes/dev/ruby/rubinius/.git/rebase-apply/patch