Name		Name	Last commit message	Last commit date
.gitignore		.gitignore
CONTRIBUTING.md		CONTRIBUTING.md
LICENSE		LICENSE
README.md		README.md
cas4-gnudiff_io.cpp		cas4-gnudiff_io.cpp
case space in name3.txt		case space in name3.txt
case2-smalldialogs.h		case2-smalldialogs.h
case3-guiutils.h		case3-guiutils.h
case5.txt		case5.txt
diff.cpp		diff.cpp
file.py		file.py
mergeresultwindows.h		mergeresultwindows.h
pdiff.cpp		pdiff.cpp

Repository files navigation

testing-conflicts

git conflict cases!

conflicted
auto resolved

Case 1: A- Doesn't exit B- Added C- Added

Case 2: A- Exists B- Deleted C- Modified

Case 3: A- Exists B- Modified C- Deleted

Case 4: A- Exists B- Modified C- Modified

About

No description, website, or topics provided.

BSD-2-Clause license

0 stars

1 watching

Report repository

Releases

Packages

Contributors

Languages