From da64faf8bde3de19fb9b0fc029df2bf6f5b691a1 Mon Sep 17 00:00:00 2001
From: Jesse Ezell <jesse.ezell@neudesic.com>
Date: Fri, 28 Feb 2014 11:13:51 -0800
Subject: switch from iota to explicit def

---
 merge.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'merge.go')

diff --git a/merge.go b/merge.go
index 11219e0..82e01fb 100644
--- a/merge.go
+++ b/merge.go
@@ -72,9 +72,9 @@ func (r *Repository) MergeHeadFromRef(ref *Reference) (*MergeHead, error) {
 type MergeFlag int
 
 const (
-	MergeFlagDefault MergeFlag = iota
-	MergeNoFastForward
-	MergeFastForwardOnly
+	MergeFlagDefault     MergeFlag = 0
+	MergeNoFastForward             = 1
+	MergeFastForwardOnly           = 2
 )
 
 type MergeOptions struct {
@@ -96,16 +96,16 @@ func (mo *MergeOptions) toC() *C.git_merge_opts {
 type MergeTreeFlag int
 
 const (
-	MergeTreeFindRenames MergeTreeFlag = 1 << iota
+	MergeTreeFindRenames MergeTreeFlag = 1 << 0
 )
 
 type MergeFileFavorType int
 
 const (
-	MergeFileFavorNormal MergeFileFavorType = iota
-	MergeFileFavorOurs
-	MergeFileFavorTheirs
-	MergeFileFavorUnion
+	MergeFileFavorNormal MergeFileFavorType = 0
+	MergeFileFavorOurs                      = 1
+	MergeFileFavorTheirs                    = 2
+	MergeFileFavorUnion                     = 3
 )
 
 type MergeTreeOptions struct {
-- 
cgit v1.2.3