Just testing
Solving merge problems with git
Merge branch 'master' of ssh://github.com:22/renatocf/dotfiles
Adding .gitconfig to be replaced by GitHub ones
Adding .gitconfig and .gitignore. Modifying .bashrc and paths
Merge branch 'master' of ssh://github.com:22/renatocf/dotfiles
Merge branch 'master' of ssh://github.com:22/renatocf/dotfiles
Removing paths.bash to refresh
Adding modifications in bash, bim and git
Bash: .bashrc and .bash/aliases.bash modified. .gitgonfig now setting difftool. Vim: modifications in the plugin.