![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 21 Mar 2010 00:28:14 +0000 (19:28 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Mar 2010 03:36:10 +0000 (20:36 -0700) | ||
| commit | 6a843348ab08e7c701ac2343ffbe2d11ecb7ebab | |
| tree | e255330fbfa1cf626f2e2285417847a02a5d919a | tree | snapshot |
| parent | 47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf | commit | diff |
tests: document cherry-pick behavior in face of conflicts
We are about to change the format of the conflict hunks that
cherry-pick and revert write. 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
cherry-pick and revert write. 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/t3507-cherry-pick-conflict.sh | [new file with mode: 0644] | blob |