GitHub - dreiss/merge-examples: Example merge conflicts

Name		Name	Last commit message	Last commit date
Latest commit History 2 Commits
10-meet-kdiff3		10-meet-kdiff3
20-granularity		20-granularity
24-need-base-single		24-need-base-single
26-need-base-multi		26-need-base-multi
27-need-base-multi-space		27-need-base-multi-space
30-multi-add-python		30-multi-add-python
35-multi-add-json		35-multi-add-json
40-align-logging		40-align-logging
45-align-function		45-align-function
50-join-ifdef		50-join-ifdef
55-join-funcdef		55-join-funcdef
60-add-in-deleted		60-add-in-deleted
65-modify-in-deleted		65-modify-in-deleted
70-modify-duplicated		70-modify-duplicated
template		template
kdiff3-noauto.sh		kdiff3-noauto.sh
update.sh		update.sh

Provide feedback