Thu, 20 Jan 2022 16:16:05 -0800 |
Martin von Zweigbergk |
filemerge: pass `simplemerge.MergeInput` to tool functions
|
Thu, 20 Jan 2022 14:42:50 -0800 |
Martin von Zweigbergk |
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
|
Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
Thu, 20 Jan 2022 13:43:43 -0800 |
Martin von Zweigbergk |
filemerge: set default labels a little earlier
|
Thu, 20 Jan 2022 11:17:09 -0800 |
Martin von Zweigbergk |
filemerge: remove unused arguments from `_merge()`
|
Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
Thu, 20 Jan 2022 09:04:39 -0800 |
Martin von Zweigbergk |
filemerge: make `labels` a required arg for `_premerge()`
|
Thu, 20 Jan 2022 14:46:16 -0800 |
Martin von Zweigbergk |
filemerge: remove unnecessary check for empty string
|