summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-12-13 00:45:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 01:26:23 (GMT)
commitc53d696bcc2894b0df277e617740b15bac794df9 (patch)
treecb48d15e37c4a03db6d9f6ade5ea5cb69c04996f /merge-file.c
parentfa2376f3c89ae59f33e50e0e5769dec2652e9568 (diff)
downloadgit-c53d696bcc2894b0df277e617740b15bac794df9.zip
git-c53d696bcc2894b0df277e617740b15bac794df9.tar.gz
git-c53d696bcc2894b0df277e617740b15bac794df9.tar.bz2
git-svn: correctly handle packed-refs in refs/remotes/
We now use git-rev-parse universally to read refs, instead of our own file_to_s function (which I plan on removing). Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions