Mercurial > hg

log tests/test-rename-dir-merge.t @ 28745:8a23f88131c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -7 tip
age author description
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Wed, 13 Jan 2016 10:10:05 -0600 Matt Mackall copies: fix detection of divergent directory renames
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Fri, 12 Dec 2014 23:18:36 -0800 Martin von Zweigbergk merge: don't overwrite untracked file at directory rename target
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
less more | (0) -10 -7 tip