comparison tests/test-rename-merge1.t @ 26992:b3b5ed560283

shelve: switch to mergestate.read() See previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 13:56:10 -0800
parents d16d73173fdd
children 296d55def9c4
comparison
equal deleted inserted replaced
26991:2ddc92bae4a7 26992:b3b5ed560283