Tue, 02 Dec 2014 17:11:01 -0800 | Martin von Zweigbergk | update: add tests for untracked local file | changeset | files |
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 |