summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--test/git/test_index.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 37c5e30c..eec80860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/build
/dist
/doc/_build
+nbproject
diff --git a/test/git/test_index.py b/test/git/test_index.py
index 30f38257..13d2c10d 100644
--- a/test/git/test_index.py
+++ b/test/git/test_index.py
@@ -546,7 +546,7 @@ class TestIndex(TestBase):
self.failUnlessRaises(GitCommandError, index.move, files)
# again, with force
- assert_mv_rval(index.move(files, force=True))
+ assert_mv_rval(index.move(files, f=True))
# files into directory - dry run
paths = ['LICENSE', 'VERSION', 'doc']