]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/overlapping-range-set'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:58:17 +0000 (12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:58:17 +0000 (12:58 -0700)
* 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


Trivial merge