File merging flags
| 819 | |
| 820 | |
| 821 | class MergeFileFlag(IntFlag): |
| 822 | """File merging flags""" |
| 823 | |
| 824 | DEFAULT = C.GIT_MERGE_FILE_DEFAULT |
| 825 | """ Defaults """ |
| 826 | |
| 827 | STYLE_MERGE = C.GIT_MERGE_FILE_STYLE_MERGE |
| 828 | """ Create standard conflicted merge files """ |
| 829 | |
| 830 | STYLE_DIFF3 = C.GIT_MERGE_FILE_STYLE_DIFF3 |
| 831 | """ Create diff3-style files """ |
| 832 | |
| 833 | SIMPLIFY_ALNUM = C.GIT_MERGE_FILE_SIMPLIFY_ALNUM |
| 834 | """ Condense non-alphanumeric regions for simplified diff file """ |
| 835 | |
| 836 | IGNORE_WHITESPACE = C.GIT_MERGE_FILE_IGNORE_WHITESPACE |
| 837 | """ Ignore all whitespace """ |
| 838 | |
| 839 | IGNORE_WHITESPACE_CHANGE = C.GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE |
| 840 | """ Ignore changes in amount of whitespace """ |
| 841 | |
| 842 | IGNORE_WHITESPACE_EOL = C.GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL |
| 843 | """ Ignore whitespace at end of line """ |
| 844 | |
| 845 | DIFF_PATIENCE = C.GIT_MERGE_FILE_DIFF_PATIENCE |
| 846 | """ Use the "patience diff" algorithm """ |
| 847 | |
| 848 | DIFF_MINIMAL = C.GIT_MERGE_FILE_DIFF_MINIMAL |
| 849 | """ Take extra time to find minimal diff """ |
| 850 | |
| 851 | STYLE_ZDIFF3 = C.GIT_MERGE_FILE_STYLE_ZDIFF3 |
| 852 | """ Create zdiff3 ("zealous diff3")-style files """ |
| 853 | |
| 854 | ACCEPT_CONFLICTS = C.GIT_MERGE_FILE_ACCEPT_CONFLICTS |
| 855 | """ |
| 856 | Do not produce file conflicts when common regions have changed; |
| 857 | keep the conflict markers in the file and accept that as the merge result. |
| 858 | """ |
| 859 | |
| 860 | |
| 861 | class MergeFlag(IntFlag): |
nothing calls this directly
no outgoing calls
no test coverage detected
searching dependent graphs…