dotfiles/merge_conf, branch master My configuration files https://git.nelin.dk/dotfiles/atom?h=master 2023-03-22T11:10:28Z Add option to count diff in mergeconf and query before merging 2023-03-22T11:10:28Z 0scar qgt268@alumni.ku.dk 2023-03-22T11:10:28Z urn:sha1:d9a19b14ec4f40986eec35c1e9448d1e47e71b5f Add script to easily merge local and repo files 2022-08-17T13:51:39Z 0scar qgt268@alumni.ku.dk 2022-08-17T13:51:39Z urn:sha1:fa30c58013689488b25f6918882ad63a93becaa9