Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
branchstable
changeset 12055 81c4e18c7cee
parent 10282 08a0f04b56bd
child 12387 4f8067c94729 
--- 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
Mercurial