diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | 66a6a3142074473c91eb7f11de4d745647d43540 (patch) | |
| tree | a532985d98f541d276965d42600362fd372669c5 /diff-lib.c | |
| parent | 7d5c884ead4e95cdccb21e8624b49fd6b95f3827 (diff) | |
| parent | 2f59c947044d535e078941711e562d825eb055e3 (diff) | |
| download | git-66a6a3142074473c91eb7f11de4d745647d43540.tar.gz git-66a6a3142074473c91eb7f11de4d745647d43540.tar.xz | |
Merge branch 'mz/rerere-remaining'
* mz/rerere-remaining:
mergetool: don't skip modify/remove conflicts
rerere "remaining"
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions