summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 17:47:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 17:47:17 (GMT)
commitd5c48c531816102d3a86fd807fb19e661a3787d5 (patch)
tree931ffa31daf296279e7819496c39d919ce87191d /combine-diff.c
parentad709ea985b527adb546f4c841fbd480f2c6bdfd (diff)
parent74e42ce122bfcbd2e1a06395b80d6a4b44580148 (diff)
downloadgit-d5c48c531816102d3a86fd807fb19e661a3787d5.zip
git-d5c48c531816102d3a86fd807fb19e661a3787d5.tar.gz
git-d5c48c531816102d3a86fd807fb19e661a3787d5.tar.bz2
Merge branch 'maint'
* maint: add-interactive: Clarify “remaining hunks in the file”
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions