diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:50:46 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:50:46 +0200 |
| commit | 5d1c674ea818ea534476ed0ca5436e0b513f86a4 (patch) | |
| tree | 703bcd8caf958007e90d6694e5225084b3ddfdb5 /storage/filesystem | |
| parent | 9af0609c2df9957f75e1930acd19fee07d4a3043 (diff) | |
| download | go-git-5d1c674ea818ea534476ed0ca5436e0b513f86a4.tar.gz | |
fix merge commit
Diffstat (limited to 'storage/filesystem')
| -rw-r--r-- | storage/filesystem/internal/dotgit/dotgit_test.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index e3a3c00..6151c8f 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -445,11 +445,7 @@ func (s *SuiteDotGit) TestObject(c *C) { file, err := dir.Object(hash) c.Assert(err, IsNil) c.Assert(strings.HasSuffix( -<<<<<<< HEAD file.Name(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), -======= - file.Filename(), fs.Join("objects", "03", "db8e1fbe133a480f2867aac478fd866686d69e")), ->>>>>>> 86f6ba1dea8972df7c017e01ddb2c097892bc220 Equals, true, ) } |