diff LICENSE @ 13:24ba462b9b4b

Return the `default' argument when the given `user' argument is `None' and when it is the first call on merge
author Franz Glasner <f.glasner@feldmann-mg.com>
date Wed, 09 Mar 2016 11:43:18 +0100
parents f76d85ccc5b9
children 6c7f90dbce98
line wrap: on
line diff