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 /t/t4101/diff.1-3 | |
parent | Merge branch 'nd/sorted-builtin-command-list' (diff) | |
parent | mergetool: don't skip modify/remove conflicts (diff) | |
download | tgif-66a6a3142074473c91eb7f11de4d745647d43540.tar.xz |
Merge branch 'mz/rerere-remaining'
* mz/rerere-remaining:
mergetool: don't skip modify/remove conflicts
rerere "remaining"
Diffstat (limited to 't/t4101/diff.1-3')
0 files changed, 0 insertions, 0 deletions