Mercurial > hg
log mercurial/merge.py @ 30902:e6932e9a262a
age | author | description |
---|---|---|
Wed, 08 Feb 2017 23:03:33 -0800 | Martin von Zweigbergk | merge: remove unused handling of default destination in merge.update() |
Wed, 08 Feb 2017 14:49:37 -0800 | Martin von Zweigbergk | update: localize logic around which ancestor to use |
Wed, 01 Feb 2017 02:10:30 +0100 | Mads Kiilerich | merge: more safe detection of criss cross merge conflict between dm and r stable |