log mercurial/merge.py @ 6425:2d9328a2f81f

age author description
Sat, 29 Mar 2008 12:39:47 -0500 Matt Mackall copies: skip directory rename checks when not merging
Mon, 24 Mar 2008 20:28:13 +0100 Thomas Arendsen Hein Fix missing space in one of the new update messages.
Mon, 24 Mar 2008 10:01:05 -0500 Matt Mackall update: better logic and messages for updates
Sat, 22 Mar 2008 13:30:08 -0500 Matt Mackall update: no -C needed to switch branches without outstanding changes
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall diff: use copy smarts from copies.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall copies: move findcopies code to its own module
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: move symmetricdifferences to ancestor.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify some helpers
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: more simplifications to checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: privatize some functions, unnest some others
Fri, 14 Mar 2008 11:01:31 -0500 Alexis S. L. Carvalho merge: notice uncommited copies (issue1000)
Fri, 14 Mar 2008 09:56:58 -0300 Alexis S. L. Carvalho merge: require --force when there are deleted files
Wed, 12 Mar 2008 15:44:08 -0700 Alexis S. L. Carvalho merge: fix handling of deleted files