Edward Thomson 78859c6344 merge: handle conflicts in recursive base building ... When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.		2015-11-25 15:38:39 -05:00
..
attr	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
attr_index	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
bad_tag.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
binaryunicode	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
blametest.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
cherrypick	Added cherry pick tests	2014-04-14 16:16:22 +02:00
config	config: Add test cases that have trailing spaces before comment chars	2014-10-04 23:28:40 +08:00
crlf/.gitted	crlf: include utf8 resources in master branch	2015-06-22 11:59:54 -04:00
crlf_data	crlf tests: posix known-good data	2015-06-22 12:00:11 -04:00
deprecated-mode.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
describe	tests: Add "describe" test repository	2014-04-30 09:31:58 +02:00
diff	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
diff_format_email	Added git_diff_stats test files	2014-04-15 17:22:03 +02:00
duplicate.git	Add failing test for git_object_short_id	2014-03-10 11:35:14 -07:00
empty_bare.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
empty_standard_repo/.gitted	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
filemodes	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
icase	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
issue_592	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
issue_592b	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
issue_1397	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
merge-recursive	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
merge-resolve	Add git_merge_status to provide info about an upcoming merge	2014-03-20 09:25:06 -07:00
merge-whitespace	Added tests to merge files and branches with whitespace problems and fixes	2015-03-16 09:53:27 +02:00
mergedrepo	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
nasty/.gitted	checkout tests: nasty symlinks	2015-01-20 17:13:09 -06:00
nsecs	index: test that we round-trip nsecs	2015-10-22 09:29:40 -04:00
partial-testrepo/.gitted	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
peeled.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
push_src	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
rebase	git_rebase_commit: drop already-picked commits	2014-10-26 22:59:21 -04:00
redundant.git	Add test case	2015-11-02 13:47:04 +01:00
renames	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
revert	revert tests: always use core.autocrlf=false in tests	2014-10-27 17:27:25 -04:00
shallow.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
short_tag.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
status	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
sub.git	repo::reservedname: test a submodule update	2015-09-18 12:17:49 -04:00
submod2	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
submod2_target	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
submodule_simple	submodule init should resolve relative url paths	2014-12-22 16:35:45 -05:00
submodule_with_path	submodule: test updating a submodule w/ a path	2015-11-04 16:53:41 -05:00
submodules	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
super	repo::reservedname: test a submodule update	2015-09-18 12:17:49 -04:00
template	repo::init test: create hook symlink	2015-01-08 19:23:37 +00:00
testrepo/.gitted	checkout test: ensure .gitattributes lifecycle	2015-02-02 22:46:39 -05:00
testrepo2	remote: apply insteadOf configuration.	2015-05-31 13:21:53 +02:00
testrepo.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
twowaymerge.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
typechanges	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
unsymlinked.git	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
userdiff	Update the javascript diff driver's function pattern.	2014-10-09 22:21:34 +02:00
.gitattributes	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
.gitignore	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
bad.index	tree-cache: Don't segfault upon corruption	2013-11-19 13:25:37 +01:00
big.index	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
gitgit.index	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
push.sh	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00