Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3715:6cb3aca69cdc
age | author | description |
---|---|---|
Mon, 27 Nov 2006 15:27:09 -0800 | Brendan Cully | Make context __eq__ handle arbitrary RHS values |
Thu, 23 Nov 2006 22:45:00 -0800 | Brendan Cully | merge: Don't search for copies across unrelated manifests |
Sat, 18 Nov 2006 11:34:19 -0600 | Matt Mackall | avoid unnecessary copy merges |
Fri, 17 Nov 2006 08:06:54 +0100 | Thomas Arendsen Hein | white space and line break cleanups |
Wed, 01 Nov 2006 21:47:55 -0600 | Matt Mackall | Clarify untracked file merge message |
Tue, 31 Oct 2006 13:03:23 +0100 | Benoit Boissinot | merge with backout |