Mercurial > hg-stable
comparison mercurial/scmutil.py @ 26609:47681e77e484
filemerge: only print out "merging f" output at premerge step
We're soon going to call this function twice, once for premerge and once for
merge. This makes sure the "merging" output only gets printed during the
premerge step.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 20:02:53 -0700 |
| parents | 56b2bcea2529 |
| children | 88c4e97b9669 |
comparison
equal
deleted
inserted
replaced
| 26608:ae5b60d3294f | 26609:47681e77e484 |
|---|