Mercurial > hg
log mercurial/mergeutil.py @ 46466:3e3b81b6e7da
| age | author | description |
|---|---|---|
| Mon, 18 May 2020 17:29:53 -0400 | Augie Fackler | cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) |
| Mon, 23 Nov 2020 16:48:13 -0800 | Martin von Zweigbergk | errors: raise StateError when there are unresolves merge conflicts |
| Thu, 17 Sep 2020 22:34:36 -0700 | Martin von Zweigbergk | mergedriver: delete it |
| Tue, 08 Oct 2019 15:06:18 -0700 | Martin von Zweigbergk | cleanup: join string literals that are already on one line |
| Sun, 06 Oct 2019 09:48:39 -0400 | Augie Fackler | formatting: byteify all mercurial/ and hgext/ string literals |
| Sun, 06 Oct 2019 09:45:02 -0400 | Augie Fackler | formatting: blacken the codebase |
| Mon, 21 Nov 2016 21:31:45 -0500 | Augie Fackler | checkunresolved: move to new package to help avoid import cycles base mercurial/cmdutil.py@6f8f5f29bb57 |