| commit | ced621b2c15c3d3dd65dd1d7eec984f8546a4673 | |
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
| Sat, 22 Nov 2008 23:13:00 +0000 (23 00:13 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Nov 2008 03:55:52 +0000 (23 19:55 -0800) | ||
| tree | 332d3af816ed077b58c81a5beb459655008fb740 | treesnapshot (tar.gz zip) |
| parent | 9b864e730bda0e028a85387fa568429724582f22 | commitdiff |
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>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| ll-merge.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory |