diff COPYING @ 22895:dfa44e25bb53

dirstate: properly clean-up some more merge state on setparents
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Oct 2014 13:05:50 -0500
parents 8c8b55733cbd
children
line wrap: on
line diff