Andrew's git / gitweb.git / diff
?
tests: document format of conflicts from checkout -m
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:27:17 +0000 (19:27 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:10 +0000 (20:36 -0700)
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>
No differences found