Mercurial > hg

comparison tests/test-rename-merge2.t @ 21024:7731a2281cf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes from spell checker
author Mads Kiilerich <madski@unity3d.com>
date Sun, 13 Apr 2014 19:01:00 +0200
parents 18adc15635a1
children 0d67fccc0d43
comparison
equal deleted inserted replaced
21023:57b50abe2b24 21024:7731a2281cf0
772 $ cd .. 772 $ cd ..
773 773
774 774
775 Systematic and terse testing of merge merges and ancestor calculation: 775 Systematic and terse testing of merge merges and ancestor calculation:
776 776
777 Excpected result: 777 Expected result:
778 778
779 \ a m1 m2 dst 779 \ a m1 m2 dst
780 0 - f f f "versions differ" 780 0 - f f f "versions differ"
781 1 f g g g "versions differ" 781 1 f g g g "versions differ"
782 2 f f f f "versions differ" 782 2 f f f f "versions differ"