]> git.ipfire.org Git - thirdparty/git.git/commit - ll-merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b864e7) | patch
merge-recursive: use strbuf_expand() instead of interpolate()
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Sat, 22 Nov 2008 23:13:00 +0000 (00:13 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2008 03:55:52 +0000 (19:55 -0800)
commitced621b2c15c3d3dd65dd1d7eec984f8546a4673
tree332d3af816ed077b58c81a5beb459655008fb740tree | snapshot
parent9b864e730bda0e028a85387fa568429724582f22commit | diff
merge-recursive: use strbuf_expand() instead of interpolate()

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ll-merge.c diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.