tree: 5cca558e1992505bd01797ffd4df93a9e99b586d
  1. merge.go
  2. merge_test.go