| commit | 47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 21 Mar 2010 00:27:17 +0000 (20 19:27 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Mar 2010 03:36:10 +0000 (20 20:36 -0700) | ||
| tree | ab475e75359b3e4c34c71b6db1060136dc04731c | treesnapshot (tar.gz zip) |
| parent | 0d0925c5e25fad8079739be36d88faa21fc1f588 | commitdiff |
tests: document format of conflicts from checkout -m
We are about to change the format of the conflict hunks that ‘checkout
--merge’ writes. Add tests checking the current behavior first.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We are about to change the format of the conflict hunks that ‘checkout
--merge’ writes. Add tests checking the current behavior first.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7201-co.sh | diffblobblamehistory |