Mercurial > hg
log tests/test-rebase-conflicts.t @ 15501:2371f4aea665
age | author | description |
---|---|---|
Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) |
Sun, 06 Mar 2011 15:21:50 +0100 | Patrick Mezard | Improve unresolved merge conflicts warning (issue2681) stable |
Sat, 30 Oct 2010 16:58:15 -0500 | Steve Borho | rebase: improve resolve failure message stable |