Mercurial > hg
log
age | author | description |
---|---|---|
Wed, 12 Oct 2016 12:22:18 +0200 | Mads Kiilerich | merge: only show "cannot merge flags for %s" warning if flags are different |
Wed, 12 Oct 2016 12:22:18 +0200 | Mads Kiilerich | tests: add test coverage of merging x flag without ancestor |