summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authortaylorchu <[email protected]>2015-05-30 22:27:08 +0200
committerCarlos Martín Nieto <[email protected]>2015-05-30 22:27:08 +0200
commit53c158fbd7e5f4dac787f5c3a7107fcb4116f676 (patch)
treeee98007a87f3b9bd371af020d47946989d0fd628 /merge.go
parent35ff0de8559ed987ff82b025cc2bb5983f29e559 (diff)
Fix test error messages
Diffstat (limited to 'merge.go')
0 files changed, 0 insertions, 0 deletions