view contrib/debian/copyright @ 28634:3ceac01bc29f

merge: save merge part labels for later reuse We permit the caller of merge operations to supply labels for the merge parts ("local", "other", and optionally "base"). These labels are used in conflict markers to reduce confusion; however, the labels were not persistent, so 'hg resolve' would lose the labels. Store the labels in the mergestate.
author Simon Farnsworth <simonfar@fb.com>
date Sat, 19 Mar 2016 18:37:10 -0700
parents 7f49efcaa9b4
children 0175074882c6
line wrap: on
line source

Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mercurial
Source: http://www.selenic.com/mercurial/

Files: *
Copyright: 2005-2015, Matt Mackall <mpm@selenic.com> and others.
License: GPL-2+
 This program is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied
 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU General Public License for more
 details.
 .
 You should have received a copy of the GNU General Public
 License along with this package; if not, write to the Free
 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 Boston, MA  02110-1301 USA
 .
 On Debian systems, the full text of the GNU General Public
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.