Merge branch 'tr/add-i-no-escape' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:02:04 +0000 (12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:02:04 +0000 (12:02 -0700)
commit1618297f10c612af3e56187825e3f273e6bbdcdb
treef85130dc01a26a9fd09803dc936bf03d5f5ef349
parent398dbe536d5e94b7f7263fc4900b5e6f788f495a
parentb5cc003253c8e1b505d5a2fbbcecb1ffcb409758
Merge branch 'tr/add-i-no-escape' into maint

* tr/add-i-no-escape:
  add -i: ignore terminal escape sequences