diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-28 13:25:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-28 13:25:57 -0800 |
| commit | 524ee675a36961c5b59302e84ffd08808f4f787e (patch) | |
| tree | d64fc7d9b88c9be517e87fdf82f8a3fb31ee5f01 /t/t7600-merge.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | Add a setting to require a filter to be successful (diff) | |
| download | tgif-524ee675a36961c5b59302e84ffd08808f4f787e.tar.xz | |
Merge branch 'jb/required-filter'
* jb/required-filter:
Add a setting to require a filter to be successful
Conflicts:
convert.c
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions