diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:27:17 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:10 -0700 |
| commit | 47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf (patch) | |
| tree | ab475e75359b3e4c34c71b6db1060136dc04731c /git-pull.sh | |
| parent | Update draft release notes to 1.7.1 (diff) | |
| download | tgif-47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf.tar.xz | |
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>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions