Mercurial > hg
log
age | author | description |
---|---|---|
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 |