diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-12-12 16:45:00 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-12 17:26:23 -0800 |
| commit | c53d696bcc2894b0df277e617740b15bac794df9 (patch) | |
| tree | cb48d15e37c4a03db6d9f6ade5ea5cb69c04996f /builtin-merge-file.c | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-c53d696bcc2894b0df277e617740b15bac794df9.tar.xz | |
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 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions