]> git.proxmox.com Git - libgit2.git/commit
Merge pull request #2477 from ethomson/merge
authorVicent Marti <vicent@github.com>
Wed, 23 Jul 2014 07:41:52 +0000 (09:41 +0200)
committerVicent Marti <vicent@github.com>
Wed, 23 Jul 2014 07:41:52 +0000 (09:41 +0200)
commit9de6ec52008e3f30a4e8a5c6a13859eefcf86f57
tree62d6be7b45f3ce7363f2802b5c3ff35e8ec0ca31
parent243db06ce3ab5ac984e24867815add6251819561
parent994404b5067f9cc35dfae2c460e209f30467c3b5
Merge pull request #2477 from ethomson/merge

Don't allow conflicts by default