Mercurial > hg

diff mercurial/simplemerge.py @ 22901:722117c8e023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
duplicatecopies: move from cmdutil to copies This is in preparation for moving its primary caller into merge.py, which would be a layering violation in the current location.
author Matt Mackall <mpm@selenic.com>
date Mon, 13 Oct 2014 14:33:13 -0500
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff