Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 5708:f6bf89722e29

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
Thu, 27 Dec 2007 22:47:44 -0600 Matt Mackall merge: add flag merging intelligence
Thu, 27 Dec 2007 22:27:48 -0600 Matt Mackall merge: use util.set_flags
Thu, 27 Dec 2007 22:27:37 -0600 Matt Mackall merge: simplify merge tests, fix exec flag bug
Wed, 26 Dec 2007 23:03:32 +0100 Thomas Arendsen Hein merge with crew-stable
Wed, 26 Dec 2007 22:47:16 +0100 Thomas Arendsen Hein Fix misleading error and prompts during update/merge (issue556)
Sun, 02 Dec 2007 15:15:49 -0600 Matt Mackall update: default to tipmost branch if default branch doesn't exist
Mon, 05 Nov 2007 18:49:35 -0200 Alexis S. L. Carvalho Honour the exec bit when we go back in time.
less more | (0) -100 -30 -10 -7 tip