facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
7,546 Commits 24 Branches 62 Tags 322 MiB
823b43d5b5
Commit Graph

2 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
a4fb0722ca change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
Thomas Arendsen Hein
a721ac99f0 Add instructions how to redo/finish failed merge with local working directory. 
d29fcc4d1e2a already implemented this for branch merges.
 2006-12-11 18:09:52 +01:00