summaryrefslogtreecommitdiff
path: root/xdiff/xinclude.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-31 23:26:45 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-31 23:26:45 -0700
commit423a15c849487fda5dc5cdfc15658062cfdd11b0 (patch)
tree83699d5d69e36375e7caf2f4af8fceab4bd4ba82 /xdiff/xinclude.h
parentMerge branch 'master' into next (diff)
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
downloadtgif-423a15c849487fda5dc5cdfc15658062cfdd11b0.tar.xz
Merge branch 'master' into next
* master: gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn
Diffstat (limited to 'xdiff/xinclude.h')
0 files changed, 0 insertions, 0 deletions