facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
4,728 Commits 24 Branches 62 Tags 322 MiB
d69c63e916
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
Alexis S. L. Carvalho
9248b0bde4 filecommit: don't forget the local parent on a merge with a local rename 2007-01-30 19:09:08 -02:00