Merge branch 'jk/stable-prio-queue' into next
commit46e9bc3cddf0f11657a96d3376b8fd3ceb1588a3
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 18:00:46 +0000 (22 11:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 18:00:46 +0000 (22 11:00 -0700)
treefaf1b1c04636d2e8453291f9a5394ac990c64846
parentaa8d6ea553526ae56548439b5db4e7147d9e0065
parentf0e802ca200b1296495d2ee5c55cd8f8083486bc
Merge branch 'jk/stable-prio-queue' into next

* 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