summaryrefslogtreecommitdiff
path: root/xdiff/xpatience.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-11 09:33:06 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-11 09:33:06 -0700
commit2dbae5acc7b3d0615bcf534ac85181a3185cb6de (patch)
tree77159fbd1ae17a93eccf48e7b1c65ca968afe20d /xdiff/xpatience.c
parentc3f6163b0b6e2cfae1422050c9607db1130cded0 (diff)
parentb74307f6a551d50e9b1aa121a326d32ff1827a93 (diff)
downloadgit-2dbae5acc7b3d0615bcf534ac85181a3185cb6de.tar.gz
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update cherry-pick error message parsing gitk: Quote tag names in event bindings to avoid problems with % chars gitk: Allow user to control how much of the SHA1 ID gets auto-selected gitk: spelling fixes in Russian translation gitk: Take only numeric version components when computing $git_version
Diffstat (limited to 'xdiff/xpatience.c')
0 files changed, 0 insertions, 0 deletions