equal
deleted
inserted
replaced
758 $ hg -R merge-test2 manifest -r tip |
758 $ hg -R merge-test2 manifest -r tip |
759 converted/a |
759 converted/a |
760 converted/b |
760 converted/b |
761 x |
761 x |
762 $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n' |
762 $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n' |
763 o 6eaa merge a & b |
763 o e2ff merge a & b |
764 |\ - converted/a |
764 |\ - converted/a |
765 | | - toberemoved |
|
766 | | |
765 | | |
767 | o 2995 add b |
766 | o 2995 add b |
768 | | - converted/b |
767 | | - converted/b |
769 | | |
768 | | |
770 @ | 150e add x & remove tobremoved |
769 @ | 150e add x & remove tobremoved |