equal
deleted
inserted
replaced
36 hg co 0 |
36 hg co 0 |
37 hg diff --nodates | grep "^[+-][^<>]" |
37 hg diff --nodates | grep "^[+-][^<>]" |
38 hg st |
38 hg st |
39 |
39 |
40 echo "# local merge with conflicts" |
40 echo "# local merge with conflicts" |
41 HGMERGE=merge hg co |
41 hg co |
42 hg co 0 |
42 hg co 0 |
43 hg diff --nodates | grep "^[+-][^<>]" |
43 hg diff --nodates | grep "^[+-][^<>]" |
44 hg st |
44 hg st |
45 |
45 |
46 echo "# local merge without conflicts" |
46 echo "# local merge without conflicts" |
47 hg revert zzz2_merge_bad |
47 hg revert zzz2_merge_bad |
48 HGMERGE=merge hg co |
48 hg co |
49 hg diff --nodates | grep "^[+-][^<>]" |
49 hg diff --nodates | grep "^[+-][^<>]" |
50 hg st |
50 hg st |