Merge branch 'sg/t6050-failing-editor-test-fix'

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

Junio C Hamano committed Jan 20, 2016 at 11:43 UTC 1576f783425b9cb7f7e54839c4a66adb2e95afea

No changes.