Merge branch 'es/overlapping-range-set'
commit0d64cdf8e2d7a24bfa6d7246a75c5f207e088164
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:58:17 +0000 (18 12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:58:17 +0000 (18 12:58 -0700)
tree105b7d4311fb2c04c7cb2ea7262f95a286af2c48
parent45ed4afabee57a2583f4b88828f598573f7cd239
parent3755b53af779ce75fa3ea4581a0e6525bc67278d
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