diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2011-04-12 08:41:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:03:54 -0700 |
| commit | 9973d9329b71556178ef32b4f8cfedab009a18d8 (patch) | |
| tree | e5abcb10839691c67d3a235c2e5ea8697cd60b03 /Documentation/git-merge-file.txt | |
| parent | do not overwrite untracked symlinks (diff) | |
| download | tgif-9973d9329b71556178ef32b4f8cfedab009a18d8.tar.xz | |
t2021: mark a test as fixed
The failure was fixed by the previous commit.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions