Deal with merge conflicts directly

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index 1a7a3f0..7888f29 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(name = 'stgit',
       url = 'http://www.procode.org/stgit/',
       description = 'Stacked GIT',
       long_description = 'Push/pop utility on top of GIT',
-      scripts = ['stg', 'gitmergeonefile.py'],
+      scripts = ['stg'],
       packages = ['stgit', 'stgit.commands'],
       data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
                     ('share/stgit/examples', glob.glob('examples/*.tmpl')),