diff tests/test-diff-issue2761.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 73e3e368bd42
children 55c6ebd11cb9
line wrap: on
line diff