]> git.proxmox.com Git - libgit2.git/commit - src/util.h
Merge branch 'pr/2740'
authorEdward Thomson <ethomson@microsoft.com>
Wed, 14 Jan 2015 16:19:28 +0000 (10:19 -0600)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 14 Jan 2015 16:19:28 +0000 (10:19 -0600)
commit85880693d53d401aac71705fe55c406b82de6f0d
tree0707c79af3eda662b20410aeb3dee2142e14066e
parente6911dff9d6483a6afae4d1138151a1bc9116354
parentb3837d4d2bbcae16a32deb732afa0e7e2e9b274e
Merge branch 'pr/2740'
src/merge.c