diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 08:26:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 08:26:02 (GMT) |
| commit | 02273fdbd07ddaa13a232db0ae63a720c4a013f0 (patch) | |
| tree | 714a6c735a550296c9edd073129d327feb7c87ce /csum-file.h | |
| parent | c8a140fee4e7df83b7eb781e436b88b067f149d1 (diff) | |
| parent | 6232b3438d127def8cc0612e45422347578c6102 (diff) | |
| download | git-02273fdbd07ddaa13a232db0ae63a720c4a013f0.zip git-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.gz git-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.bz2 | |
Merge branch 'jc/revert-merge'
* jc/revert-merge:
cherry-pick/revert -m: add tests
revert/cherry-pick: work on merge commits as well
Conflicts:
builtin-revert.c
Diffstat (limited to 'csum-file.h')
0 files changed, 0 insertions, 0 deletions