Mercurial > public > mercurial-scm > hg
log mercurial/mergeutil.py @ 48674:f7086f6173f8 stable
| age | author | description |
|---|---|---|
| Thu, 25 Mar 2021 18:02:08 +0100 | Rapha?l Gom?s | contributor: change mentions of mpm to olivia |
| 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 |