summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-10 11:03:03 -0700
committerJunio C Hamano <gitster@pobox.com>2014-08-10 11:03:03 -0700
commit67de23ddb1ed5471e302f6a84fae7a9037a0d980 (patch)
tree92588a7bef801b233b9c6ae69a6629808a9c5aba /t/t3030-merge-recursive.sh
parentf82887f29010e1ec88ec1930a99ddc56b6438452 (diff)
parent09898e7c3b040086e8addd4ef226548c9dce1460 (diff)
downloadgit-67de23ddb1ed5471e302f6a84fae7a9037a0d980.tar.gz
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
* 'master' of git://ozlabs.org/~paulus/gitk: gitk: Updated Bulgarian translation (302t,0f,0u) gitk: Add keybinding to switch to parent commit
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions