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)
* tr/add-i-no-escape:
  add -i: ignore terminal escape sequences


Trivial merge