Revision b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 authored by Junio C Hamano on 12 March 2012, 22:43:06 UTC, committed by Junio C Hamano on 12 March 2012, 22:43:15 UTC
The code to synthesize the fake ancestor tree used by 3-way merge fallback in "git am" was not prepared to read a patch created with a non-standard -p<num> value. * jc/am-3-nonstandard-popt: test: "am -3" can accept non-standard -p<num> am -3: allow nonstandard -p<num> option
| File | Mode | Size |
|---|---|---|
| LICENSE | -rw-r--r-- | 1.6 KB |
| fast_export.c | -rw-r--r-- | 2.2 KB |
| fast_export.h | -rw-r--r-- | 501 bytes |
| line_buffer.c | -rw-r--r-- | 2.8 KB |
| line_buffer.h | -rw-r--r-- | 1.0 KB |
| line_buffer.txt | -rw-r--r-- | 2.4 KB |
| obj_pool.h | -rw-r--r-- | 1.5 KB |
| repo_tree.c | -rw-r--r-- | 8.1 KB |
| repo_tree.h | -rw-r--r-- | 789 bytes |
| string_pool.c | -rw-r--r-- | 2.1 KB |
| string_pool.h | -rw-r--r-- | 381 bytes |
| string_pool.txt | -rw-r--r-- | 1.2 KB |
| svndump.c | -rw-r--r-- | 10.9 KB |
| svndump.h | -rw-r--r-- | 176 bytes |
| trp.h | -rw-r--r-- | 7.0 KB |
| trp.txt | -rw-r--r-- | 3.3 KB |
Computing file changes ...
