Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 12055:81c4e18c7cee stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove hash-bang from non-executable script
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 26 Aug 2010 22:51:48 +0200
parents 08a0f04b56bd
children 4f8067c94729
comparison
equal deleted inserted replaced
12053:b10b07a821c3 12055:81c4e18c7cee
1 #!/usr/bin/env python
2 # Copyright (C) 2004, 2005 Canonical Ltd 1 # Copyright (C) 2004, 2005 Canonical Ltd
3 # 2 #
4 # This program is free software; you can redistribute it and/or modify 3 # This program is free software; you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License as published by 4 # it under the terms of the GNU General Public License as published by
6 # the Free Software Foundation; either version 2 of the License, or 5 # the Free Software Foundation; either version 2 of the License, or