Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 34512:482d6f6dba91
| age | author | description |
|---|---|---|
| Fri, 29 Sep 2017 15:48:34 +0000 | Alex Gaynor | style: never use a space before a colon or comma |
| Fri, 30 Jun 2017 03:43:13 +0200 | Boris Feld | configitems: register the 'merge.preferancestor' config |
| Sat, 30 Sep 2017 15:48:08 +0530 | Pulkit Goyal | py3: use pycompat.bytestr instead of str |
| Sat, 30 Sep 2017 15:45:15 +0530 | Pulkit Goyal | py3: explicitly convert dict.keys() and dict.items() into a list |
| Thu, 14 Sep 2017 13:14:32 -0700 | Phil Cohen | merge: allow a custom working context to be passed to update |
| Tue, 12 Sep 2017 19:27:01 -0700 | Phil Cohen | merge: move cwd-missing detection to helper functions |
| Mon, 11 Sep 2017 13:17:43 -0700 | Phil Cohen | merge: flush any deferred writes just before recordupdates() |