Mercurial > hg-stable
log
age | author | description |
---|---|---|
Tue, 02 Dec 2014 17:11:01 -0800 | Martin von Zweigbergk | update: add tests for untracked local file stable |
Wed, 03 Dec 2014 11:02:52 -0800 | Martin von Zweigbergk | merge: don't overwrite conflicting file in locally renamed directory |
Wed, 03 Dec 2014 10:56:07 -0800 | Martin von Zweigbergk | merge: don't ignore conflicting file in remote renamed directory |
Sun, 23 Nov 2014 15:08:50 -0800 | Martin von Zweigbergk | merge: duplicate 'if f in copied' into each branch |