> Are you signalling the above part that it is (or isn't) included in > git-mergetool.txt by defining > > :git-mergetool: 1 > > before the piece gets included with > > include::config/mergetool.txt > > See for example how git-rev-list.txt tweaks what gets included from > rev-list-description.txt by doing: > > 'git rev-list' [<options>] <commit>... [[--] <path>...] > > DESCRIPTION > ----------- > > :git-rev-list: 1 > include::rev-list-description.txt[] > > 'rev-list' is a very essential Git command, since it > Thanks for the hint. It is now working as expected. I'll include the fix in v7 together with the other fixes that prevent `git apply` from executing cleanly.
