comparison tests/test-resolve.t @ 40578:db61a18148a4

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sat, 10 Nov 2018 12:07:26 +0900
parents b93157f69f46 da2e874fe582
children 183df3df6031
comparison
equal deleted inserted replaced
40577:157f0e29eaa3 40578:db61a18148a4
443 $ hg --config commands.resolve.mark-check=none resolve -m 443 $ hg --config commands.resolve.mark-check=none resolve -m
444 (no more unresolved files) 444 (no more unresolved files)
445 $ hg resolve -l 445 $ hg resolve -l
446 R file1 446 R file1
447 R file2 447 R file2
448 Test with marking an explicit file as resolved, this should not abort (since
449 there's no --force flag, we have no way of combining --all with a filename)
450 $ hg resolve --unmark
451 $ hg resolve -l
452 U file1
453 U file2
454 (This downgrades to a warning since an explicit file was specified).
455 $ hg --config commands.resolve.mark-check=abort resolve -m file2
456 warning: the following files still have conflict markers:
457 file2
458 $ hg resolve -l
459 U file1
460 R file2
448 Testing the --re-merge flag 461 Testing the --re-merge flag
449 $ hg resolve --unmark file1 462 $ hg resolve --unmark file1
450 $ hg resolve -l 463 $ hg resolve -l
451 U file1 464 U file1
452 R file2 465 R file2