comparison hgweb.cgi @ 26651:d58f2f0e2b19

merge.mergedriver: don't try resolving files marked driver-resolved The driver is expected to take care of these.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Sep 2015 19:43:51 -0700
parents 4b0fc75f9403
children 47ef023d0165
comparison
equal deleted inserted replaced
26650:6ff5534c8afc 26651:d58f2f0e2b19