Commit b22369efa243022ff42582b559ddb6c6e05af2b1

Edward Thomson 2015-05-18T17:01:37

diff conflicts: test index to workdir w/ conflicts