ply Test warning messages

Test warning messages

Open rconradharris opened this issue 11 years ago • 1 comments

Getting this when running the tests:

Failed to merge in the changes. error: cache entry has null sha1: README fatal: unable to write new index file

Using: git version 1.7.12.4 (Apple Git-37)

Don't recall getting this error message before. Need to test it against different versions of git.

Jun 16 '13 19:06 rconradharris

test_upstream_changed gives 'failed to merge in the changes'

test_abort gives that plus

error: cache entry has null sha1: README fatal: unable to write new index file

Also, when it aborts it leaves the conflicting file in the working tree.

Jun 16 '13 23:06 rconradharris