Mercurial > hg

diff mercurial/merge.py @ 31818:8fa516b264c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: fix deprecation version for 'repo.join' The patch lingered for a while and nobody noticed when it was resubmitted.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 04 Apr 2017 16:48:58 +0200
parents e960eba3581c
children 4d504e541d3d
line wrap: on
line diff