Sat, 13 Dec 2014 23:52:22 -0800 | Martin von Zweigbergk | merge: extract method for checking for conflicting untracked file | changeset | files |
Mon, 15 Dec 2014 16:45:19 -0800 | Martin von Zweigbergk | merge: create 'cm' action for 'get or merge' case | changeset | files |
Fri, 12 Dec 2014 23:18:36 -0800 | Martin von Zweigbergk | merge: don't overwrite untracked file at directory rename target | changeset | files |
Tue, 18 Nov 2014 20:29:25 -0800 | Martin von Zweigbergk | merge: remove constant tuple element from 'aborts' | changeset | files |
Wed, 19 Nov 2014 11:51:31 -0800 | Martin von Zweigbergk | merge: collect checking for unknown files at end of manifestmerge() | changeset | files |
Wed, 19 Nov 2014 11:48:30 -0800 | Martin von Zweigbergk | merge: introduce 'c' action like 'g', but with additional safety | changeset | files |