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

Junio C Hamano committed Jul 18, 2013 at 12:58 UTC 0d64cdf8e2d7a24bfa6d7246a75c5f207e088164

No changes.