Merge branch 'sg/t6050-failing-editor-test-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:20 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:21 +0000 (14:54 -0800)
* sg/t6050-failing-editor-test-fix:
  t6050-replace: make failing editor test more robust


Trivial merge