Merge branch 'jk/stable-prio-queue'
commit4799593e26f09e4209249caf9536001036618ac2
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:14 +0000 (27 15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2014 22:14:15 +0000 (27 15:14 -0700)
treefba851e4ab180d0b9ef8055d7c4ebda42034c402
parent996b0fdbb4ff63bfd880b3901f054139c95611cf
parentf0e802ca200b1296495d2ee5c55cd8f8083486bc
Merge branch 'jk/stable-prio-queue'

* 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
commit.c