diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-01 15:04:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-04 10:13:45 -0800 |
| commit | 77b43cac9feac1079f3643988cfadee63e4365f7 (patch) | |
| tree | 8112c8d1a622fea00458aa3f9c29247e704465ea /Documentation/git-fast-export.txt | |
| parent | 76da5b1d22a7f0e3e34a780df91717e6269e84b4 (diff) | |
| download | git-77b43cac9feac1079f3643988cfadee63e4365f7.tar.gz | |
t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fix
With a conflicted index, this used to give us an error.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-export.txt')
0 files changed, 0 insertions, 0 deletions