Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 4659:7a7d4937272b
age | author | description |
---|---|---|
Tue, 19 Jun 2007 08:51:34 +0200 | Thomas Arendsen Hein | Updated copyright notices and add "and others" to "hg version" |
Tue, 19 Jun 2007 08:06:37 +0200 | Thomas Arendsen Hein | Cleanup of whitespace, indentation and line continuation. |
Mon, 18 Jun 2007 12:38:54 -0700 | Brendan Cully | Make fast-forward merges full merges |
Tue, 08 May 2007 11:42:48 -0500 | Matt Mackall | Merge with stable |
Tue, 08 May 2007 02:59:13 -0500 | Matt Mackall | merge: fix spurious merges for copies in linear updates |
Sun, 06 May 2007 20:27:45 -0700 | Brendan Cully | Add fast-forward branch merging |