equal
deleted
inserted
replaced
119 domerge -r 2 --config ui.merge=internal:local |
119 domerge -r 2 --config ui.merge=internal:local |
120 |
120 |
121 echo "# ui.merge specifies internal:other:" |
121 echo "# ui.merge specifies internal:other:" |
122 domerge -r 2 --config ui.merge=internal:other |
122 domerge -r 2 --config ui.merge=internal:other |
123 |
123 |
|
124 echo "# ui.merge specifies internal:prompt:" |
|
125 domerge -r 2 --config ui.merge=internal:prompt |
|
126 |
|
127 echo "# ui.merge specifies internal:dump:" |
|
128 domerge -r 2 --config ui.merge=internal:dump |
|
129 echo f.base: |
|
130 cat f.base |
|
131 echo f.local: |
|
132 cat f.local |
|
133 echo f.other: |
|
134 cat f.other |
|
135 rm f.base f.local f.other |
|
136 echo |
|
137 |
124 echo "# ui.merge specifies internal:other but is overruled by pattern for false:" |
138 echo "# ui.merge specifies internal:other but is overruled by pattern for false:" |
125 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
139 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
126 |
140 |
127 echo |
141 echo |
128 echo Premerge |
142 echo Premerge |