Mercurial > hg

diff mercurial/merge.py @ 29002:ea794f2eb19d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: unindent "if True" block in sort() It was there to make the previous patch readable.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 23 Apr 2016 16:11:05 +0900
parents 3ceac01bc29f
children bdc86e178255
line wrap: on
line diff