Mercurial > hg

diff tests/test-merge1.t @ 26993:d240ae897ba6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 56b2bcea2529
children 6a6e78f84cc6
line wrap: on
line diff