Add mergetool support to the classic StGit infrastructure

[stgit] / .gitignore

diff --git a/.gitignore b/.gitignore
index d45ff67..e7fffb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@ dist
 MANIFEST
 patches-*
 *-stamp
+release.sh
+setup.cfg.rpm
+snapshot.sh
+stgit-completion.bash