diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
| commit | 048b64024a14feb0d9ed26abe97c542cfacbc8af (patch) | |
| tree | ff17714706a56f2af7b7ef8f550070344fd6b0ff /Git/Types.hs | |
| parent | 051c68041b5b7a58e7080403e389d0641691edfd (diff) | |
sync: Automatically resolves merge conflicts.
untested, but it compiles :)
Diffstat (limited to 'Git/Types.hs')
| -rw-r--r-- | Git/Types.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Git/Types.hs b/Git/Types.hs index e8cdbb442..0c37427c7 100644 --- a/Git/Types.hs +++ b/Git/Types.hs @@ -51,6 +51,7 @@ type Tag = Ref {- Types of objects that can be stored in git. -} data ObjectType = BlobObject | CommitObject | TreeObject + deriving (Eq) instance Show ObjectType where show BlobObject = "blob" @@ -65,6 +66,7 @@ readObjectType _ = Nothing {- Types of blobs. -} data BlobType = FileBlob | ExecutableBlob | SymlinkBlob + deriving (Eq) {- Git uses magic numbers to denote the type of a blob. -} instance Show BlobType where |