summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-17 12:37:58 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-17 13:36:35 -0800
commit912342d9d69a30e49491f3fd4d3aa8dc2f6050f3 (patch)
treed784232c52f8d7cd6338dc172edd11a3a7eaf1b2 /builtin-merge-recursive.c
parentedfd45d2a0fc85d55479e13e8e3dc7e975a313ce (diff)
downloadgit-912342d9d69a30e49491f3fd4d3aa8dc2f6050f3.tar.gz
combine-diff.c: use strbuf_readlink()
When showing combined diff using work tree contents, use strbuf_readlink() to read symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions