facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
9,040 Commits 24 Branches 62 Tags 324 MiB
04658a9b97
Commit Graph

4 Commits

Author SHA1 Message Date
Dirkjan Ochtman
7daf0cc9cd merge: rename -S/--show option to -P/--preview 2009-06-19 13:58:48 +02:00
Dirkjan Ochtman
2f19dcd8ee merge: add -S/--show option to review revisions without merging 2009-05-14 16:03:17 +02:00
Benoit Boissinot
513ea49cfc improve error message for 'hg merge' when repo already at branchtip 2007-08-25 11:30:11 +02:00
Vadim Gelfer
efefb2e2cb merge with other head by default, not tip. 
fixes issue 339.
 2006-08-15 11:38:07 -07:00