diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:28:14 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:10 -0700 |
| commit | 6a843348ab08e7c701ac2343ffbe2d11ecb7ebab (patch) | |
| tree | e255330fbfa1cf626f2e2285417847a02a5d919a /xdiff/xdiffi.c | |
| parent | tests: document format of conflicts from checkout -m (diff) | |
| download | tgif-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.tar.xz | |
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 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions