Add mergetool support to the classic StGit infrastructure

[stgit] / .gitignore

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