Merge branch 'sg/t6050-failing-editor-test-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 19:43:31 +0000 (11:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 19:43:31 +0000 (11:43 -0800)
* sg/t6050-failing-editor-test-fix:
  t6050-replace: make failing editor test more robust


Trivial merge