[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
[git] / Documentation / technical /
drwxr-xr-x   ..
-rw-r--r-- 3251 trivial-merge.txt