broomandan / dotfiles

Settings and configurations scripts

These configurations are tuned for Windows environment and need slight modifications for Linux or Mac, spcefically file paths need to be changed.

this is mike's conflicting change test git

Copy to Gitbash home directory

- .gitconfig
- winmerge-merge.sh: