![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Feb 2012 21:25:57 +0000 (13:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Feb 2012 21:25:57 +0000 (13:25 -0800) | ||
| commit | 524ee675a36961c5b59302e84ffd08808f4f787e | |
| tree | d64fc7d9b88c9be517e87fdf82f8a3fb31ee5f01 | tree | snapshot |
| parent | 25a7850a106ed0f27b88b8ce0b89fd326120dff4 | commit | diff |
| parent | 36daaaca0046542f4d5576ad5766ac55f43e3fc3 | commit | diff |
Merge branch 'jb/required-filter'
* jb/required-filter:
Add a setting to require a filter to be successful
Conflicts:
convert.c
* jb/required-filter:
Add a setting to require a filter to be successful
Conflicts:
convert.c
| convert.c | diff1 | | diff2 | | blob | history |