summaryrefslogtreecommitdiff
path: root/merge_conf
AgeCommit message (Expand)Author
2023-03-22Add option to count diff in mergeconf and query before merging0scar
2022-08-17Add script to easily merge local and repo files0scar