diff tests/get-with-headers.py @ 26993:d240ae897ba6

commands.resolve: 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:46 -0800
parents 5a6820f8da4d
children 8e86679d8acd
line wrap: on
line diff