view COPYING @ 496:c1c8f6859d3f

Recognize 'merged from parent' metastate in dirstate
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Mon, 22 Oct 2012 20:33:20 +0200
parents 3ca4ae7bdd38
children 2f33f102a8fa
line wrap: on
line source
Copyright (C) 2010-2012 TMate Software Ltd

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; version 2 of the License.
 
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.
 
For information on how to redistribute this software under 
the terms of a license other than GNU General Public License 
contact TMate Software at support@hg4j.com