Mercurial > hg
diff .hgignore @ 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 | 3232f92360d4 |
children | a1eff44c432b |