Mercurial > hg

comparison tests/test-annotate.t @ 48589:a51c522c0064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12021
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 15:04:55 -0800
parents 74973a6d4e67
children 42d2b31cee0b
comparison
equal deleted inserted replaced
48588:402a6b6173e9 48589:a51c522c0064
219 [1] 219 [1]
220 $ cat b 220 $ cat b
221 a 221 a
222 a 222 a
223 a 223 a
224 <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 224 <<<<<<< working copy: 5fbdc1152d97 - test: b2.1
225 b4 225 b4
226 c 226 c
227 b5 227 b5
228 ||||||| base: 3086dbafde1c - test: b 228 ||||||| common ancestor: 3086dbafde1c - test: b
229 ======= 229 =======
230 b4 230 b4
231 b5 231 b5
232 b6 232 b6
233 >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 233 >>>>>>> merge rev: 37ec9f5c3d1f - test: b2
234 $ cat <<EOF > b 234 $ cat <<EOF > b
235 > a 235 > a
236 > a 236 > a
237 > a 237 > a
238 > b4 238 > b4
745 $ cat qux 745 $ cat qux
746 0 746 0
747 0 747 0
748 1 baz:1 748 1 baz:1
749 2 baz:2 749 2 baz:2
750 <<<<<<< working copy: 863de62655ef - test: baz:3+->3- 750 <<<<<<< working copy: 863de62655ef - test: baz:3+->3-
751 3- baz:3 751 3- baz:3
752 4 baz:4 752 4 baz:4
753 ||||||| base: 56fc739c091f - test: baz:3->3+ 753 ||||||| common ancestor: 56fc739c091f - test: baz:3->3+
754 3+ baz:3 754 3+ baz:3
755 4 baz:4 755 4 baz:4
756 ======= 756 =======
757 3+ baz:3 757 3+ baz:3
758 4+ baz:4 758 4+ baz:4
759 >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ 759 >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+
760 5 760 5
761 6 761 6
762 7 762 7
763 $ cat > qux <<EOF 763 $ cat > qux <<EOF
764 > 0 764 > 0
792 $ cat qux 792 $ cat qux
793 0 793 0
794 0 794 0
795 1 baz:1 795 1 baz:1
796 2 baz:2 796 2 baz:2
797 <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ 797 <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
798 3+ baz:3 798 3+ baz:3
799 4+ baz:4 799 4+ baz:4
800 ||||||| base: 56fc739c091f - test: baz:3->3+ 800 ||||||| common ancestor: 56fc739c091f - test: baz:3->3+
801 3+ baz:3 801 3+ baz:3
802 4 baz:4 802 4 baz:4
803 ======= 803 =======
804 3- baz:3 804 3- baz:3
805 4 baz:4 805 4 baz:4
806 >>>>>>> merge rev: 863de62655ef - test: baz:3+->3- 806 >>>>>>> merge rev: 863de62655ef - test: baz:3+->3-
807 5 807 5
808 6 808 6
809 7 809 7
810 $ cat > qux <<EOF 810 $ cat > qux <<EOF
811 > 0 811 > 0
1170 $ hg commit -m 3 -q 1170 $ hg commit -m 3 -q
1171 $ hg merge 2 -q 1171 $ hg merge 2 -q
1172 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 1172 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
1173 [1] 1173 [1]
1174 $ cat a 1174 $ cat a
1175 <<<<<<< working copy: 0a068f0261cf - test: 3 1175 <<<<<<< working copy: 0a068f0261cf - test: 3
1176 1 1176 1
1177 2 1177 2
1178 3 1178 3
1179 ||||||| base: 1ed24be7e7a0 - test: 2 1179 ||||||| common ancestor: 1ed24be7e7a0 - test: 2
1180 1 1180 1
1181 2 1181 2
1182 ======= 1182 =======
1183 a 1183 a
1184 >>>>>>> merge rev: 9409851bc20a - test: a 1184 >>>>>>> merge rev: 9409851bc20a - test: a
1185 $ cat > a << EOF 1185 $ cat > a << EOF
1186 > b 1186 > b
1187 > 1 1187 > 1
1188 > 2 1188 > 2
1189 > 3 1189 > 3