| commit | 77b43cac9feac1079f3643988cfadee63e4365f7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Nov 2013 22:04:08 +0000 (1 15:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Nov 2013 18:13:45 +0000 (4 10:13 -0800) | ||
| tree | 8112c8d1a622fea00458aa3f9c29247e704465ea | treesnapshot (tar.gz zip) |
| parent | 76da5b1d22a7f0e3e34a780df91717e6269e84b4 | commitdiff |
t1005: add test for "read-tree --reset -u A B"
With a conflicted index, this used to give us an error.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
With a conflicted index, this used to give us an error.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t1005-read-tree-reset.sh | diffblobblamehistory |