summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-29 20:27:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-29 20:27:10 (GMT)
commit9656153b87d47b34986f2d77eef9199c24cbf9f6 (patch)
tree775cea8cee6dafafd27ab89da6c28e95da051c3a /git-merge-resolve.sh
parent7d37b5bf4eda8b2dcca371fb4b5ebd50fed64d67 (diff)
parent719c2b9d926bf2be4879015e3620d27d32f007b6 (diff)
downloadgit-9656153b87d47b34986f2d77eef9199c24cbf9f6.zip
git-9656153b87d47b34986f2d77eef9199c24cbf9f6.tar.gz
git-9656153b87d47b34986f2d77eef9199c24cbf9f6.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug causing undefined variable error when cherry-picking
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions