[tests] Fix abandonconflict.py intermittency
commit965a12442746e99247e5ce0f43fba8e3e149cae4
authorJohn Newbery <john@johnnewbery.com>
Fri, 5 May 2017 17:01:27 +0000 (5 13:01 -0400)
committerJohn Newbery <john@johnnewbery.com>
Fri, 5 May 2017 17:01:27 +0000 (5 13:01 -0400)
tree123aacc63ebc2c46cef529d66f2de5cba810218e
parent35da2aeed7d4000dde93957c3b6e048ab83c4f2b
[tests] Fix abandonconflict.py intermittency
test/functional/abandonconflict.py