Mercurial > public > mercurial-scm > hg-stable
diff mercurial/stack.py @ 49965:3aa8e569478a
merge: don't pay for pathconflicts if there are none
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Wed, 04 Jan 2023 19:13:41 +0000 |
parents | 6000f5b25c9b |
children | f4733654f144 |