Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3674:9103dab96093
age | author | description |
---|---|---|
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 |
Tue, 31 Oct 2006 13:02:49 +0100 | Benoit Boissinot | Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 |
Sun, 29 Oct 2006 14:18:55 +0100 | Benoit Boissinot | use workingcontext.files() to detect if the repo is unclean |