summaryrefslogtreecommitdiffstats
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-24 03:28:52 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-24 03:28:52 +0200
commit998b912927281a871e8d379e2b3a4385c775c4fe (patch)
tree66d093ee0ada00ac61300c74d87d480b5b43cf42 /t/t6021-merge-criss-cross.sh
parentMerge branch 'pb/push' (diff)
parentgitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" (diff)
downloadgit-998b912927281a871e8d379e2b3a4385c775c4fe.tar.xz
git-998b912927281a871e8d379e2b3a4385c775c4fe.zip
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" gitk: Fix bug where current row number display stops working gitk: Move es.po where it belongs gitk: Fix "wrong # coordinates" error on reload
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions