Commit cd6fd81
add confilct_resolver_max_attempts property (#272)
* added confilct_resolver_max_attempts property
* Simplify `max_attempts` attribute of ConflictResolver
* Fix leftover `_max_attempts` in ConflictResolver
* Fix leftover in simple_parsing/conflicts.py
* Fix missing newline in simple_parsing/conflicts.py
---------
Co-authored-by: Fabrice Normandin <fabrice.normandin@gmail.com>1 parent d3b704a commit cd6fd81
2 files changed
+11
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
64 | 65 | | |
65 | 66 | | |
66 | 67 | | |
| |||
82 | 83 | | |
83 | 84 | | |
84 | 85 | | |
85 | | - | |
| 86 | + | |
86 | 87 | | |
87 | 88 | | |
88 | 89 | | |
| |||
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
109 | | - | |
| 110 | + | |
110 | 111 | | |
111 | | - | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
976 | 976 | | |
977 | 977 | | |
978 | 978 | | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
979 | 986 | | |
980 | 987 | | |
981 | 988 | | |
| |||
0 commit comments