diff tests/test-annotate.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 56b2bcea2529
children 2f6d5c60f6fc
line wrap: on
line diff