Document git-rebase behavior on conflicts.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 8978d043c35ad068e280dbbdc31e06524ea0ab56)
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 4246 trivial-merge.txt