diff tests/test-up-local-change.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 8e6d5b7317e6
children 296d55def9c4
line wrap: on
line diff