summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-23 10:50:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-23 10:50:06 -0700
commit4961210b17725e3e3e975d84a5f7f718da5f218e (patch)
tree8dbb170f435684277448d1f2c26b5d86c7ca9976 /git-mergetool.sh
parentMerge branch 'jm/maint-diff-words-with-sbe' (diff)
parentadd -i: ignore terminal escape sequences (diff)
downloadtgif-4961210b17725e3e3e975d84a5f7f718da5f218e.tar.xz
Merge branch 'tr/add-i-no-escape'
* tr/add-i-no-escape: add -i: ignore terminal escape sequences
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions