@@ -125,15 +125,15 @@ func (p *Patch) String() string {
125
125
if p .length1 == 0 {
126
126
coords1 = strconv .Itoa (p .start1 ) + ",0"
127
127
} else if p .length1 == 1 {
128
- coords1 = strconv .Itoa (p .start1 + 1 )
128
+ coords1 = strconv .Itoa (p .start1 + 1 )
129
129
} else {
130
130
coords1 = strconv .Itoa (p .start1 + 1 ) + "," + strconv .Itoa (p .length1 )
131
131
}
132
132
133
133
if p .length2 == 0 {
134
134
coords2 = strconv .Itoa (p .start2 ) + ",0"
135
135
} else if p .length2 == 1 {
136
- coords2 = strconv .Itoa (p .start2 + 1 )
136
+ coords2 = strconv .Itoa (p .start2 + 1 )
137
137
} else {
138
138
coords2 = strconv .Itoa (p .start2 + 1 ) + "," + strconv .Itoa (p .length2 )
139
139
}
@@ -199,7 +199,7 @@ func New() *DiffMatchPatch {
199
199
func (dmp * DiffMatchPatch ) DiffMain (text1 , text2 string , checklines bool ) []Diff {
200
200
var deadline time.Time
201
201
if dmp .DiffTimeout <= 0 {
202
- deadline = time .Now ().Add (24 * 365 * time .Hour )
202
+ deadline = time .Now ().Add (24 * 365 * time .Hour )
203
203
} else {
204
204
deadline = time .Now ().Add (dmp .DiffTimeout )
205
205
}
@@ -484,7 +484,7 @@ func (dmp *DiffMatchPatch) DiffBisect(text1, text2 string, deadline time.Time) [
484
484
}
485
485
486
486
func (dmp * DiffMatchPatch ) diffBisectSplit_ (text1 , text2 string , x , y int ,
487
- deadline time.Time ) []Diff {
487
+ deadline time.Time ) []Diff {
488
488
text1a := text1 [:x ]
489
489
text2a := text2 [:y ]
490
490
text1b := text1 [x :]
@@ -2101,4 +2101,3 @@ func (dmp *DiffMatchPatch) PatchFromText(textline string) ([]Patch, error) {
2101
2101
}
2102
2102
return patches , nil
2103
2103
}
2104
-
0 commit comments