Mercurial > hgrepos > Python > libs > ConfigMix

annotate tests/data/conf2.py @ 110:29cf359ddf4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 84b9578cacce
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
93
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
2
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
3 __all__ = ["key1", "nonexistingkey"]
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
4
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
5 key1 = u"the next value"
84b9578cacce Start with unit tests
Franz Glasner <hg@dom66.de>
parents:
diff changeset
6 key2 = "non-exported value"