Refactored merge options into separate merge-options.txt.
[git.git] / Documentation / technical /
drwxr-xr-x   ..
-rw-r--r-- 4246 trivial-merge.txt