Tutorial: adjust merge example to recursive strategy.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 0501c2409d7661d2b13f094136d246b9b5b8acf9)
-rw-r--r-- 4246 trivial-merge.txt