![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jim Meyering <jim@meyering.net> | |
| Sun, 14 Jun 2009 19:47:54 +0000 (21:47 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Jun 2009 20:37:14 +0000 (13:37 -0700) | ||
| commit | 90dce51584e908232ff279a6c2949ea9855dddf3 | |
| tree | 9d1cdacffd4be1c27f1a1ac84c28886d3cb57696 | tree | snapshot |
| parent | c97038d1cfbd98ea258086c417fe4f0c094596d3 | commit | diff |
use xstrdup, not strdup in ll-merge.c
Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| ll-merge.c | diff | blob | history |