Mercurial > hg

diff mercurial/merge.py @ 27026:c93b44b79359

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: remove completely unnecessary line I have no idea what I was thinking when I wrote this.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 23:42:32 -0800
parents 35102876d648
children a01ecbcfaf84
line wrap: on
line diff