summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/diff_p2
-rw-r--r--test/fixtures/git_config2
-rw-r--r--test/fixtures/rev_list_bisect_all2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/fixtures/diff_p b/test/fixtures/diff_p
index af4759e5..76242b58 100644
--- a/test/fixtures/diff_p
+++ b/test/fixtures/diff_p
@@ -397,7 +397,7 @@ index 1d5251d40fb65ac89184ec662a3e1b04d0c24861..98eeddda5ed2b0e215e21128112393bd
self.git_dir = git_dir
end
-- # Converstion hash from Ruby style options to git command line
+- # Conversion hash from Ruby style options to git command line
- # style options
- TRANSFORM = {:max_count => "--max-count=",
- :skip => "--skip=",
diff --git a/test/fixtures/git_config b/test/fixtures/git_config
index b8c178e3..a8cad56e 100644
--- a/test/fixtures/git_config
+++ b/test/fixtures/git_config
@@ -28,7 +28,7 @@
[branch "mainline_performance"]
remote = mainline
merge = refs/heads/master
-# section with value defined before include to be overriden
+# section with value defined before include to be overridden
[sec]
var0 = value0_main
[include]
diff --git a/test/fixtures/rev_list_bisect_all b/test/fixtures/rev_list_bisect_all
index 810b6609..342ea94a 100644
--- a/test/fixtures/rev_list_bisect_all
+++ b/test/fixtures/rev_list_bisect_all
@@ -40,7 +40,7 @@ committer David Aguilar <davvid@gmail.com> 1220418344 -0700
commit: handle --bisect-all output in Commit.list_from_string
Rui Abreu Ferrerira pointed out that "git rev-list --bisect-all"
- returns a slightly different format which we can easily accomodate
+ returns a slightly different format which we can easily accommodate
by changing the way we parse rev-list output.
http://groups.google.com/group/git-python/browse_thread/thread/aed1d5c4b31d5027