Mercurial > hg-stable

diff mercurial/ui.py @ 26609:47681e77e484

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