Wed, 03 Dec 2014 11:02:52 -0800 | Martin von Zweigbergk | merge: don't overwrite conflicting file in locally renamed directory | changeset | files |
Wed, 03 Dec 2014 10:56:07 -0800 | Martin von Zweigbergk | merge: don't ignore conflicting file in remote renamed directory | changeset | files |
Sun, 23 Nov 2014 15:08:50 -0800 | Martin von Zweigbergk | merge: duplicate 'if f in copied' into each branch | changeset | files |