james@ghostorchid:~/src/ohrrpgce$ git rebase svn/wip wip
First, rewinding head to replay your work on top of it...
Applying: autotest: add tests for one-way doors, {read,write}{map,pass}block, and (most) tileanimaion commands
Using index info to reconstruct a base tree...
M	distrib-nightly-win-wine.sh
M	distrib-nightly-win.bat
A	distrib-nightly.sh
A	distrib.sh
M	docs/htmlplot.xsl
M	docs/plotdict.xml
M	gfx_sdl.bas
M	nightly/wrap-nightly-linux-x86.sh
M	nightly/wrap-nightly-linux-x86_64.sh
M	nightly/wrap-nightly-linux.sh
M	ohrhelp/edit_npc.txt
M	testgame/autotest.hss
M	testgame/autotest.rpg
A	upload-release-mac.sh
A	upload-release.bat
A	upload-release.sh
<stdin>:270: trailing whitespace.
REM Note that this is duplicated in distrib-nightly-linux.sh
<stdin>:274: trailing whitespace.
pscp -q docs\plotdict.xml james_paige@motherhamster.org:HamsterRepublic.com/ohrrpgce/nightly/docs/
<stdin>:275: trailing whitespace.
pscp -q docs\htmlplot.xsl james_paige@motherhamster.org:HamsterRepublic.com/ohrrpgce/nightly/docs/
<stdin>:814: trailing whitespace.
CD ..
<stdin>:815: trailing whitespace.
CALL distrib.bat
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.