Mercurial > hg

diff mercurial/lock.py @ 20945:18adc15635a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: keep destination filename as key in filemerge actions Gives more readable debug output and makes it possible to compare/merge actions later.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 02 Mar 2014 18:52:16 +0100
parents c697b70f295f
children f484be02bd35
line wrap: on
line diff