summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2014-02-23 15:31:22 +0100
committerCarlos Martín Nieto <[email protected]>2014-02-23 15:31:22 +0100
commit1b09b03c0eecc4f5bad58e5647460cb8680a2188 (patch)
tree32dac887b2d360d9a313e4956263cad3ca8761b2 /merge.go
parent66e1c476199ebcd3e304659992233132c5a52c6c (diff)
parentf66502aaf44862a8671285e80327d808afee155f (diff)
Merge commit 'refs/pull/53/head' of github.com:libgit2/git2go
On top: fix git_buf handling and rename signature This fixes #57, #54. Conflicts: git.go reference.go repository.go submodule.go
Diffstat (limited to 'merge.go')
0 files changed, 0 insertions, 0 deletions