Mercurial > hg
diff COPYING @ 44408:6cf92d6c0ad5
tests: add test of committing with conflicts but no changes in wdir
I'm about to change the behavior slightly here, so let's have a test
that shows that.
Differential Revision: https://phab.mercurial-scm.org/D8194
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 28 Feb 2020 10:49:13 -0800 |
parents | 8c8b55733cbd |
children |