diff mercurial/merge.py @ 23539:cb42050f2dad

addremove: support addremove with explicit paths in subrepos Git and svn subrepos are currently not supported.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 09 Nov 2014 23:46:25 -0500
parents 416c133145ee
children 495bc1b65d25
line wrap: on
line diff