From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 23:04:32 +0000 (-0700)
Subject: Merge branch 'sc/difftool-skip'
X-Git-Tag: v1.7.8-rc0~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ad4b17b069a7b692ab801bda37c5ab35ef0208e;p=git.git

Merge branch 'sc/difftool-skip'

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

1ad4b17b069a7b692ab801bda37c5ab35ef0208e