2015-10-30 | Merge branch 'rs/pop-commit' | blob | diff | raw | |
2015-10-30 | Merge branch 'mk/blame-error-message' | blob | diff | raw | |
2015-10-30 | Merge branch 'js/misc-fixes' | blob | diff | raw | |
2015-10-30 | Merge branch 'js/imap-send-curl-compilation-fix' | blob | diff | raw | |
2015-10-30 | Merge branch 'jk/delete-modechange-conflict' | blob | diff | raw | |
2015-10-26 | merge: detect delete/modechange conflict | blob | diff | raw | |
2015-10-26 | t6031: generalize for recursive and resolve strategies | blob | diff | raw | diff to current | |