Merge branch 'sc/difftool-skip'

* sc/difftool-skip: t7800: avoid arithmetic expansion notation git-difftool: allow skipping file by typing 'n' at prompt

Junio C Hamano committed Oct 21, 2011 at 16:04 UTC 1ad4b17b069a7b692ab801bda37c5ab35ef0208e

No changes.