Merge branch 'sc/difftool-skip'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
commit1ad4b17b069a7b692ab801bda37c5ab35ef0208e
treeef5b1882b491f189681538b5f473c34e7cbff3cf
parentb76c561a74cd366786b7b762795fba1551b42149
parent15a31e78852f4ede5335552875006daeedfc3aa7
Merge branch 'sc/difftool-skip'

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