Mercurial > public > mercurial-scm > hg
comparison hgext/extdiff.py @ 10264:d6512b3e9ac0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Jan 2010 22:45:09 -0600 |
parents | ad44e1f8b3f3 25e572394f5c |
children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
10260:fe699ca08a45 | 10264:d6512b3e9ac0 |
---|---|
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 of the | 5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. | 6 # GNU General Public License version 2 or any later version. |
7 | 7 |
8 '''command to allow external programs to compare revisions | 8 '''command to allow external programs to compare revisions |
9 | 9 |
10 The extdiff Mercurial extension allows you to use external programs | 10 The extdiff Mercurial extension allows you to use external programs |
11 to compare revisions, or revision with working directory. The external | 11 to compare revisions, or revision with working directory. The external |