]> git.proxmox.com Git - libgit2.git/commit - src/transports/smart_protocol.c
Merge pull request #4061 from libgit2/ethomson/merge_opts
authorCarlos Martín Nieto <carlosmn@github.com>
Sat, 14 Jan 2017 17:12:23 +0000 (17:12 +0000)
committerGitHub <noreply@github.com>
Sat, 14 Jan 2017 17:12:23 +0000 (17:12 +0000)
commit2854e61956871f7b26ee38040e70f6db92796c1a
treeeed9172a41d24d2d3928e68df67e88b4bb5dd742
parenta6d833a29e100cae66d5144367e9102d093d4dbd
parent07bb8078cbea77e3d85bf087e2510c2e23d8fa29
Merge pull request #4061 from libgit2/ethomson/merge_opts

merge: set default rename threshold
CHANGELOG.md
src/merge.c