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

* sg/t6050-failing-editor-test-fix:
  t6050-replace: make failing editor test more robust