Mercurial > hg

diff mercurial/worker.py @ 26572:c7850af6bb75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge._merge: drop no longer necessary 'if r:' check Cleanup from an earlier patch to make premerge be directly called from the main filemerge function.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:16:19 -0700
parents c0501c26b05c
children 56b2bcea2529
line wrap: on
line diff