Mercurial > hg-stable
log mercurial/merge.py @ 7848:89e05c02a4af
| age | author | description |
|---|---|---|
| Mon, 16 Mar 2009 16:58:41 -0500 | Matt Mackall | resolve: move reset to localrepo.commit |
| Sun, 15 Feb 2009 10:50:48 -0600 | Matt Mackall | merge: mark kept local files as readded on linear update (issue539) |
| Tue, 13 Jan 2009 23:17:19 +0100 | Patrick Mezard | Merge with crew-stable |
| Tue, 13 Jan 2009 22:41:06 +0100 | Patrick Mezard | merge: fix execute bit update issue introduced by 89207edf3973 |
| Mon, 12 Jan 2009 09:16:03 +0100 | Dirkjan Ochtman | use dict.iteritems() rather than dict.items() |
| Wed, 07 Jan 2009 02:11:17 +0100 | Benoit Boissinot | correctly update dirstate after update+mode change (issue1456) |
| Wed, 08 Oct 2008 16:22:08 -0500 | Matt Mackall | merge: fix bug going backwards for already reverted files (issue1303) |