Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Thu Aug 26 11:00:46 2010 -0500
+++ b/mercurial/simplemerge.py	Thu Aug 26 22:51:48 2010 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2004, 2005 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify