Mercurial > hg

diff mercurial/changelog.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 df41c7be16d6
children ed003859f1d8
line wrap: on
line diff