Mercurial > hg
comparison hgext/extdiff.py @ 8225:46293a0c7e9f
updated license to be explicit about GPL version 2
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 01:08:54 +0200 |
parents | 5ec526c1a32f |
children | aea3a23151bd |
comparison
equal
deleted
inserted
replaced
8224:1075f5c1b3fa | 8225:46293a0c7e9f |
---|---|
1 # extdiff.py - external diff program support for mercurial | 1 # extdiff.py - external diff program support for mercurial |
2 # | 2 # |
3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | 3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
4 # | 4 # |
5 # This software may be used and distributed according to the terms | 5 # This software may be used and distributed according to the terms of the |
6 # of the GNU General Public License, incorporated herein by reference. | 6 # GNU General Public License version 2, incorporated herein by reference. |
7 | 7 |
8 ''' | 8 ''' |
9 The `extdiff' Mercurial extension allows you to use external programs | 9 The `extdiff' Mercurial extension allows you to use external programs |
10 to compare revisions, or revision with working directory. The external diff | 10 to compare revisions, or revision with working directory. The external diff |
11 programs are called with a configurable set of options and two | 11 programs are called with a configurable set of options and two |