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
5,487 Commits 24 Branches 62 Tags 322 MiB
8ae803be30
Commit Graph

3 Commits

Author SHA1 Message Date
Matt Mackall
6bf7f7256d merge: fix spurious merges for copies in linear updates 
We make better use of contexts to accurately identify copies that
don't need merges.

Add a simple test and update other tests.
 2007-05-08 02:59:13 -05:00
Matt Mackall
ebc2b5ccc8 merge: fix a bug where copies were ignored 2007-04-05 16:43:18 -05:00
Matt Mackall
4458a1780a merge: fix renaming of subdirectories under renamed directories 2007-02-27 16:20:06 -06:00