1 (binary file application/octet-stream, hash: 684e1e97708189a38235d8af496db000b1778f15) |
1 % changing local directly |
|
2 merge succeeded |
|
3 local |
|
4 base |
|
5 other |
|
6 % printing to stdout |
|
7 local |
|
8 base |
|
9 other |
|
10 local: |
|
11 local |
|
12 base |
|
13 % conflicts |
|
14 base |
|
15 <<<<<<< conflict-local |
|
16 not other |
|
17 ======= |
|
18 other |
|
19 >>>>>>> conflict-other |
|
20 end |
|
21 warning: conflicts during merge. |
|
22 merge failed |
|
23 % --no-minimal |
|
24 base |
|
25 <<<<<<< conflict-local |
|
26 not other |
|
27 end |
|
28 ======= |
|
29 other |
|
30 end |
|
31 >>>>>>> conflict-other |
|
32 warning: conflicts during merge. |
|
33 % 1 label |
|
34 base |
|
35 <<<<<<< foo |
|
36 not other |
|
37 ======= |
|
38 other |
|
39 >>>>>>> conflict-other |
|
40 end |
|
41 warning: conflicts during merge. |
|
42 % 2 labels |
|
43 base |
|
44 <<<<<<< foo |
|
45 not other |
|
46 ======= |
|
47 other |
|
48 >>>>>>> bar |
|
49 end |
|
50 warning: conflicts during merge. |
|
51 % too many labels |
|
52 abort: can only specify two labels. |
|
53 % binary file |
|
54 abort: binary-local looks like a binary file. |
|
55 % binary file --text |
|
56 warning: binary-local looks like a binary file. |
|
57 \x00local |
|
58 base |
|
59 other |
|
60 % help |
|
61 simplemerge [OPTS] LOCAL BASE OTHER |
|
62 |
|
63 Simple three-way file merge utility with a minimal feature set. |
|
64 |
|
65 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
|
66 |
|
67 By default, LOCAL is overwritten with the results of this operation. |
|
68 |
|
69 options: |
|
70 -L --label labels to use on conflict markers |
|
71 -a --text treat all files as text |
|
72 -p --print print results instead of overwriting LOCAL |
|
73 --no-minimal do not try to minimize conflict regions |
|
74 -h --help display help and exit |
|
75 -q --quiet suppress output |
|
76 % wrong number of arguments |
|
77 simplemerge: wrong number of arguments |
|
78 simplemerge [OPTS] LOCAL BASE OTHER |
|
79 |
|
80 Simple three-way file merge utility with a minimal feature set. |
|
81 |
|
82 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
|
83 |
|
84 By default, LOCAL is overwritten with the results of this operation. |
|
85 |
|
86 options: |
|
87 -L --label labels to use on conflict markers |
|
88 -a --text treat all files as text |
|
89 -p --print print results instead of overwriting LOCAL |
|
90 --no-minimal do not try to minimize conflict regions |
|
91 -h --help display help and exit |
|
92 -q --quiet suppress output |
|
93 % bad option |
|
94 simplemerge: option --foo not recognized |
|
95 simplemerge [OPTS] LOCAL BASE OTHER |
|
96 |
|
97 Simple three-way file merge utility with a minimal feature set. |
|
98 |
|
99 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
|
100 |
|
101 By default, LOCAL is overwritten with the results of this operation. |
|
102 |
|
103 options: |
|
104 -L --label labels to use on conflict markers |
|
105 -a --text treat all files as text |
|
106 -p --print print results instead of overwriting LOCAL |
|
107 --no-minimal do not try to minimize conflict regions |
|
108 -h --help display help and exit |
|
109 -q --quiet suppress output |