diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-11-10 16:04:43 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-12 14:47:45 +0900 |
| commit | 89c4ee4e74269635e69c84800ece0f8b754636f6 (patch) | |
| tree | 45ded2d35419d8a355d39d299648b4ee8cc196e0 /argv-array.c | |
| parent | Git 2.15 (diff) | |
| download | tgif-89c4ee4e74269635e69c84800ece0f8b754636f6.tar.xz | |
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'argv-array.c')
0 files changed, 0 insertions, 0 deletions