Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 3862:46abbed02b2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -7 tip
age author description
Sun, 10 Dec 2006 20:35:28 -0200 Alexis S. L. Carvalho Use UTF-8 in .hg/branch
Mon, 04 Dec 2006 17:10:31 -0600 Matt Mackall imported patch collision
Sun, 03 Dec 2006 16:16:33 -0600 Matt Mackall Handle transcoding of branch names
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: handle directory renames
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: move check for empty ancestor into findcopies
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: only store one direction of copies in the copy map
less more | (0) -100 -30 -10 -7 tip