Mercurial > hg
log
age | author | description |
---|---|---|
Fri, 24 Jan 2020 15:18:19 -0800 | Martin von Zweigbergk | merge: replace a repo.lookup('.') by more typical repo['.'].node() |
Fri, 24 Jan 2020 16:07:42 -0800 | Martin von Zweigbergk | merge: drop now-unused "abort" argument from hg.merge() |
Fri, 24 Jan 2020 17:49:21 -0800 | Martin von Zweigbergk | merge: don't auto-pick destination with `hg merge 'wdir()'` |
Fri, 24 Jan 2020 16:05:11 -0800 | Martin von Zweigbergk | merge: call hg.abortmerge() directly and return early |
Fri, 24 Jan 2020 16:00:54 -0800 | Martin von Zweigbergk | merge: check that there are no conflicts after --abort |
Fri, 24 Jan 2020 15:07:44 -0800 | Martin von Zweigbergk | merge: use check_incompatible_arguments() for --abort |