]> git.proxmox.com Git - libgit2.git/commitdiff
Merge pull request #2100 from libgit2/rb/update-pqueue
authorVicent Marti <vicent@github.com>
Fri, 7 Feb 2014 17:32:06 +0000 (18:32 +0100)
committerVicent Marti <vicent@github.com>
Fri, 7 Feb 2014 17:32:06 +0000 (18:32 +0100)
Replace priority queue code with implementation from hashsig

1  2 
src/merge.c
src/revwalk.c

diff --cc src/merge.c
Simple merge
diff --cc src/revwalk.c
Simple merge