Commit Graph

103 Commits

Author SHA1 Message Date
Stefano Tortarolo
dfee711e26 graft: preserve original source in subsequent grafts 2011-11-12 13:15:40 +01:00
Matt Mackall
66de5cde16 merge: give a special message for internal:merge failure (issue3105) 2011-11-16 18:04:19 -06:00
Matt Mackall
3c5a04f076 graft: add a test 2011-10-24 17:01:49 -05:00