diff tests/test-conflict-1.t @ 882:8b51d737f949

git_handler: move cStringIO to a global import There are a couple of places that use StringIO for the added features it has over cStringIO, so we can't replace all its uses wholesale.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 13 Apr 2015 08:03:57 -0700
parents 5e2f63e1064c
children 93d58b79d816
line wrap: on
line diff