Show More
@@ -2568,6 +2568,14 b' Templates used for customizing the outpu' | |||
|
2568 | 2568 | |
|
2569 | 2569 | Can be overridden per-merge-tool, see the ``[merge-tools]`` section. |
|
2570 | 2570 | |
|
2571 | ``oneline-summary`` | |
|
2572 | A template used by `hg rebase` and other commands for showing a one-line | |
|
2573 | summary of a commit. If the template configured here is longer than one | |
|
2574 | line, then only the first line is used. | |
|
2575 | ||
|
2576 | The template can be overridden per command by defining a template in | |
|
2577 | `oneline-summary.<command>`, where `<command>` can be e.g. "rebase". | |
|
2578 | ||
|
2571 | 2579 | ``pre-merge-tool-output`` |
|
2572 | 2580 | A template that is printed before executing an external merge tool. This can |
|
2573 | 2581 | be used to print out additional context that might be useful to have during |
General Comments 0
You need to be logged in to leave comments.
Login now