]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/stable-prio-queue'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:14 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:15 +0000 (15:14 -0700)
* jk/stable-prio-queue:
  t5539: update a flaky test
  paint_down_to_common: use prio_queue
  prio-queue: make output stable with respect to insertion
  prio-queue: factor out compare and swap operations

1  2 
commit.c

diff --cc commit.c
Simple merge