Commit cd29dc0
committed
mergeme: Update mtime if file is equal and introduce ignore-mtime
Updates the mtime per default if the file is equal and adds a new
feature flag called "ignore-mtime" to ignore mtime updates if the
target file is equal.
Signed-off-by: gcarq <[email protected]>1 parent 07e9ff3 commit cd29dc0
3 files changed
+13
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
| 162 | + | |
162 | 163 | | |
163 | 164 | | |
164 | 165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5422 | 5422 | | |
5423 | 5423 | | |
5424 | 5424 | | |
| 5425 | + | |
5425 | 5426 | | |
5426 | 5427 | | |
5427 | 5428 | | |
| |||
5830 | 5831 | | |
5831 | 5832 | | |
5832 | 5833 | | |
| 5834 | + | |
| 5835 | + | |
| 5836 | + | |
| 5837 | + | |
| 5838 | + | |
| 5839 | + | |
| 5840 | + | |
5833 | 5841 | | |
5834 | 5842 | | |
5835 | 5843 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
533 | 533 | | |
534 | 534 | | |
535 | 535 | | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
536 | 540 | | |
537 | 541 | | |
538 | 542 | | |
| |||
0 commit comments