diff options
| author |  Jim Meyering <jim@meyering.net> | 2009-06-14 21:47:54 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-14 13:37:14 -0700 |
| commit | 90dce51584e908232ff279a6c2949ea9855dddf3 (patch) | |
| tree | 9d1cdacffd4be1c27f1a1ac84c28886d3cb57696 /Documentation/git-pull.txt | |
| parent | git-rerere.txt: grammatical fixups and cleanups (diff) | |
| download | tgif-90dce51584e908232ff279a6c2949ea9855dddf3.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions