Mercurial > hgrepos > Python > libs > ConfigMix
diff tests/test.py @ 110:29cf359ddf4d
Remove the "_first" parameter from "merge" and "safe_merge" by splitting into two functions
| author | Franz Glasner <hg@dom66.de> |
|---|---|
| date | Sat, 24 Mar 2018 16:06:08 +0100 |
| parents | 057d87d030f1 |
| children | c50ad93eb5dc |
