Thu, 18 Dec 2014 09:22:09 -0800 | Martin von Zweigbergk | merge: move checking of unknown files out of manifestmerge() | changeset | files |
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 |