mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
7061f5c2c5
Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> |
||
---|---|---|
.. | ||
trivial-merge.txt |