bup: import merge_dict

[bup.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 11d3bcaa9c84757105cda0187b6d0536ecde59cf..3a20ea324878807c3c9afb88d2d119728dd3f885 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 /bup
 /cmd/bup-*
 /cmd/python-cmd.sh
-/lib/bup/_version.py
 randomgen
 memtest
 *.o
@@ -17,3 +16,4 @@ memtest
 nbproject
 /t/sampledata/var/
 /t/tmp/
+/lib/bup/_checkout.py