docs: adds merge behavior documentation
treecedbf77dc5c737386ee03b49af97d598c52ace47
-rw-r--r-- 1344 LICENSE
-rw-r--r-- 1317 Makefile
-rw-r--r-- 2133 README
lrwxrwxrwx 27 ReleaseNotes.txt -> docs/ReleaseNotes-1.3.1.txt
drwxr-xr-x - dist
drwxr-xr-x - docs
drwxr-xr-x - lua
drwxr-xr-x - rockspecs
drwxr-xr-x - tests
drwxr-xr-x - util