comparison tests/test-commit.out @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents c9cd63a6fce9
children a2d93b186a0e
comparison
equal deleted inserted replaced
3291:0b5d626b354e 3295:764688cf51e5