summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-01 06:59:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-01 06:59:41 (GMT)
commit39a76bdd7de18b2bb2651dcb8136563df41e84f7 (patch)
tree8b5b0c0c3135b1bbbbe8e55d0c9436a41cee466a /combine-diff.c
parent363cfc1716c9192053aaceb7e61e6a3af5699ddd (diff)
parent68149a71978564aaef7a5fe956cf1de2864c16d3 (diff)
downloadgit-39a76bdd7de18b2bb2651dcb8136563df41e84f7.zip
git-39a76bdd7de18b2bb2651dcb8136563df41e84f7.tar.gz
git-39a76bdd7de18b2bb2651dcb8136563df41e84f7.tar.bz2
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Avoid handling the Return key twice in Add Branch gitk: Show local changes properly when we have a path limit gitk: Fix switch statement in parseviewargs gitk: Index line[hnd]tag arrays by id rather than row number
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions