view tests/test-merge4.out @ 9510:8bd669948b2e

doc: clarify license footers Mercurial is licensed under version 2 of the GPL
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 01 Oct 2009 11:40:53 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)