diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2010-01-24 22:40:20 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-24 14:53:24 -0800 |
| commit | eca9388f398eb3256fafbf875a8a4ff5a73ab6f2 (patch) | |
| tree | 1d24bc58529f25ad777c09b4772d237f2d136e71 /builtin-merge-ours.c | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-eca9388f398eb3256fafbf875a8a4ff5a73ab6f2.tar.xz | |
Make test numbers unique
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions