Mercurial > hg
diff mercurial/merge.py @ 9462:1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 10 Sep 2009 23:15:37 +0200 |
parents | 86b4a9b0ddda |
children | 4c041f1ee1b4 |