about summary refs log tree commit diff
path: root/Documentation/technical/trivial-merge.txt