summaryrefslogtreecommitdiff
path: root/diffcore-rename.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-12 18:32:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-12 18:32:49 -0700
commit3d045897585c4b1ca0dce6bb5a33331f1b48c2bf (patch)
tree34e52c7654827bf06d83b6e04c16fa3e5e2b0c53 /diffcore-rename.c
parentMerge branch 'jn/doc-pull' (diff)
parentsha1_name.c: fix parsing of ":/token" syntax (diff)
downloadtgif-3d045897585c4b1ca0dce6bb5a33331f1b48c2bf.tar.xz
Merge branch 'jc/sha1-name-find-fix'
* jc/sha1-name-find-fix: sha1_name.c: fix parsing of ":/token" syntax Conflicts: sha1_name.c
Diffstat (limited to 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions