equal
deleted
inserted
replaced
1200 merged version. |
1200 merged version. |
1201 |
1201 |
1202 ":tagmerge" |
1202 ":tagmerge" |
1203 Uses the internal tag merge algorithm (experimental). |
1203 Uses the internal tag merge algorithm (experimental). |
1204 |
1204 |
|
1205 ":union" |
|
1206 Uses the internal non-interactive simple merge algorithm for merging |
|
1207 files. It will use both left and right sides for conflict regions. No |
|
1208 markers are inserted. |
|
1209 |
1205 Internal tools are always available and do not require a GUI but will by |
1210 Internal tools are always available and do not require a GUI but will by |
1206 default not handle symlinks or binary files. |
1211 default not handle symlinks or binary files. |
1207 |
1212 |
1208 Choosing a merge tool |
1213 Choosing a merge tool |
1209 ===================== |
1214 ===================== |