--- 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