Mercurial > hg
view tests/test-xdg.t @ 49224:cdb85d0512b8
branching: fix wrong merge conflict resolution from 13dfad0f9f7a
13dfad0f9f7a merged stable into default, but accidentally added the
_blockingreader class from stable (but deindented) instead of merging the
changes from stable (2fe4efaa59af) into the existing _blockingreader class.
This resulted in the _blockingreader being there two times.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Wed, 25 May 2022 17:23:16 +0200 |
parents | 7d8da7b54dc0 |
children | a4b3b8dee0a8 |
line wrap: on
line source
#if no-windows no-osx $ mkdir -p xdgconf/hg $ echo '[ui]' > xdgconf/hg/hgrc $ echo 'username = foobar' >> xdgconf/hg/hgrc $ XDG_CONFIG_HOME="`pwd`/xdgconf" ; export XDG_CONFIG_HOME $ unset HGRCPATH $ hg config ui.username 2>/dev/null foobar #endif