Commit Graph

2 Commits

Author SHA1 Message Date
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Matt Mackall
346758f77c merge: move the bulk of simplemerge into core
- keep existing simplemerge command in contrib
- clean up test interface
2008-02-03 19:29:05 -06:00