facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
9,053 Commits 24 Branches 62 Tags 322 MiB
56469b1da7
Commit Graph

6 Commits

Author SHA1 Message Date
Simon Heimberg
09ac1e6c92 separate import lines from mercurial and general python modules 2009-04-28 17:40:46 +02:00
Steve Borho
83629eeaea simplemerge: use ui.warn() for warnings 2009-04-30 23:57:36 -05:00
Benoit Boissinot
ea7fe6dacc remove unused variables 2008-10-28 19:25:26 +01:00
Matt Mackall
6c908ebf9b chmod -x simplemerge.py 2008-10-22 13:05:40 -05:00
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