From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jul 2014 22:14:14 +0000 (-0700)
Subject: Merge branch 'jk/stable-prio-queue'
X-Git-Tag: v2.1.0-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4799593e26f09e4209249caf9536001036618ac2?ds=inline;hp=--cc

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
---

4799593e26f09e4209249caf9536001036618ac2