aboutsummaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-28 14:46:05 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-28 14:46:05 -0700
commitf2df3104ce45bc1ee6d7c16f3a02f1d157c65e07 (patch)
tree0fab49f2d65cee265a23f3b95e84c57a0e38430f /xdiff-interface.c
parentdf37727a65c87cf9bba35befca1255031649553f (diff)
parentb258116462399b318c86165c61a5c7123043cfd4 (diff)
downloadgit-f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07.tar.gz
git-f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07.tar.xz
Merge branch 'jk/transfer-limit-redirection' into maint-2.3
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions