notnite.com
1package main
2
3import (
4 "fmt"
5 "os"
6
7 "github.com/bluekeyes/go-gitdiff/gitdiff"
8 "tangled.sh/tangled.sh/core/patchutil"
9)
10
11func main() {
12 if len(os.Args) != 3 {
13 fmt.Println("Usage: combinediff <patch1> <patch2>")
14 os.Exit(1)
15 }
16
17 patch1, err := os.Open(os.Args[1])
18 if err != nil {
19 fmt.Println(err)
20 }
21 patch2, err := os.Open(os.Args[2])
22 if err != nil {
23 fmt.Println(err)
24 }
25
26 files1, _, err := gitdiff.Parse(patch1)
27 if err != nil {
28 fmt.Println(err)
29 }
30
31 files2, _, err := gitdiff.Parse(patch2)
32 if err != nil {
33 fmt.Println(err)
34 }
35
36 combined := patchutil.CombineDiff(files1, files2)
37 fmt.Println(combined)
38}