diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-03-21 00:28:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-21 03:36:10 (GMT) |
| commit | 6a843348ab08e7c701ac2343ffbe2d11ecb7ebab (patch) | |
| tree | e255330fbfa1cf626f2e2285417847a02a5d919a /diffcore-pickaxe.c | |
| parent | 47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf (diff) | |
| download | git-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.zip git-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.tar.gz git-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.tar.bz2 | |
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>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions