Mon, 27 Feb 2017 15:09:19 -0800 |
Martin von Zweigbergk |
merge: combine the "merge" cases in docstring table
|
Mon, 27 Feb 2017 15:07:01 -0800 |
Martin von Zweigbergk |
merge: combine "dirty" cases in docstring table
|
Mon, 27 Feb 2017 15:29:34 -0800 |
Martin von Zweigbergk |
merge: clarify non-linear default updates in docstring table
|
Mon, 27 Feb 2017 15:02:36 -0800 |
Martin von Zweigbergk |
merge: combine the two "can't happen" cases in docstring table
|
Mon, 27 Feb 2017 15:00:13 -0800 |
Martin von Zweigbergk |
merge: move "incompatible options" case first in docstring table
|
Mon, 27 Feb 2017 14:58:53 -0800 |
Martin von Zweigbergk |
merge: make "linear" an input in docstring table
|
Mon, 27 Feb 2017 14:33:17 -0800 |
Martin von Zweigbergk |
merge: drop redundant column in docstring table
|
Mon, 27 Feb 2017 14:27:22 -0800 |
Martin von Zweigbergk |
merge: drop obsolete non-linear cases from docstring table
|
Thu, 09 Feb 2017 09:52:32 -0800 |
Martin von Zweigbergk |
destutil: remove duplicate check and leave it to merge.update()
|
Thu, 09 Feb 2017 09:55:31 -0800 |
Martin von Zweigbergk |
update: fix typo/stale comment to match code
|
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
|
Tue, 31 Jan 2017 03:25:59 +0100 |
Mads Kiilerich |
merge: fix crash on criss cross merge with dir move and delete (issue5020)
stable
|