From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jul 2013 19:58:17 +0000 (-0700)
Subject: Merge branch 'es/overlapping-range-set'
X-Git-Tag: v1.8.4-rc0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d64cdf8e2d7a24bfa6d7246a75c5f207e088164;p=thirdparty%2Fgit.git

Merge branch 'es/overlapping-range-set'

* es/overlapping-range-set:
  range_set: fix coalescing bug when range is a subset of another
  t4211: fix broken test when one -L range is subset of another
---

0d64cdf8e2d7a24bfa6d7246a75c5f207e088164