Revision 90dce51584e908232ff279a6c2949ea9855dddf3 authored by Jim Meyering on 14 June 2009, 19:47:54 UTC, committed by Junio C Hamano on 14 June 2009, 20:37:14 UTC
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>
1 parent c97038d
| File | Mode | Size |
|---|---|---|
| xdiff.h | -rw-r--r-- | 2.9 KB |
| xdiffi.c | -rw-r--r-- | 14.4 KB |
| xdiffi.h | -rw-r--r-- | 1.8 KB |
| xemit.c | -rw-r--r-- | 5.1 KB |
| xemit.h | -rw-r--r-- | 1.1 KB |
| xinclude.h | -rw-r--r-- | 1.2 KB |
| xmacros.h | -rw-r--r-- | 1.9 KB |
| xmerge.c | -rw-r--r-- | 12.1 KB |
| xprepare.c | -rw-r--r-- | 11.1 KB |
| xprepare.h | -rw-r--r-- | 1.1 KB |
| xtypes.h | -rw-r--r-- | 1.6 KB |
| xutils.c | -rw-r--r-- | 7.5 KB |
| xutils.h | -rw-r--r-- | 1.7 KB |
Computing file changes ...
