tree 245b3f208dbcd718db1e94d3a32ad56a48d96402
parent 01517bd26ff6ad179c0ea60161193aa4bac1bcb7
parent 36fc7d8a7979b4e75d36b4eab77782beb7d93533
author Junio C Hamano <gitster@pobox.com> 1454712860 -0800
committer Junio C Hamano <gitster@pobox.com> 1454712861 -0800

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

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