Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PR] Set colordiff as the default svn diff cmd-tool #1077

Merged
merged 1 commit into from
Jan 4, 2017
Merged

[PR] Set colordiff as the default svn diff cmd-tool #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/subversion-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# This file is copied to /home/vagrant/.subversion during provisioning.

[helpers]
diff-cmd = colordiff
2 changes: 2 additions & 0 deletions provision/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ profile_setup() {
fi

cp "/srv/config/subversion-servers" "/home/vagrant/.subversion/servers"
cp "/srv/config/subversion-config" "/home/vagrant/.subversion/config"

if [[ ! -d "/home/vagrant/bin" ]]; then
mkdir "/home/vagrant/bin"
Expand All @@ -167,6 +168,7 @@ profile_setup() {
echo " * Copied /srv/config/bash_aliases to /home/vagrant/.bash_aliases"
echo " * Copied /srv/config/vimrc to /home/vagrant/.vimrc"
echo " * Copied /srv/config/subversion-servers to /home/vagrant/.subversion/servers"
echo " * Copied /srv/config/subversion-config to /home/vagrant/.subversion/config"
echo " * rsync'd /srv/config/homebin to /home/vagrant/bin"

# If a bash_prompt file exists in the VVV config/ directory, copy to the VM.
Expand Down