Mercurial > hg

diff mercurial/simplemerge.py @ 31466:b6bbfbaa205a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: fix deprecation warning version of wfile The patch lingered a bit too long in my local clone and I messed up when I updated the version number. Since nobody caught it, I'm fixing the version after the fact.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 16 Mar 2017 11:17:55 -0700
parents 35284f933518
children c31d45623304
line wrap: on
line diff