diff COPYING @ 18250:f54898526aad

hidden: use both parents of working directory If we are merging with and extinct revision, this extinct revision should not be hidden.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 08 Jan 2013 17:31:00 +0100
parents 8c8b55733cbd
children
line wrap: on
line diff