Permalink
Browse files

Removed Araxis merge, enter kdiff3. Clean directories

  • Loading branch information...
1 parent a711c2a commit 7504e6acfd8dff18200136c883c3e6ab5de96a70 @rriveras committed Feb 7, 2012
View
@@ -4,4 +4,4 @@ alias tc='top -o command' # alphabetical
# git info, similar to svn info
# To get the main repo 'git remote -v'
-alias gi='. ~/.bash/utils/git_info.sh'
+alias gi='. ~/.bash/git_info.sh'
View
@@ -9,6 +9,3 @@ export EDITOR='vim -w'
export LC_CTYPE=en_US.UTF-8
export LC_ALL=en_US.UTF-8
-# Export araxis merge for git, svn usage
-export PATH=$PATH:$HOME/.bash/utils
-# export PATH="~/.bash/utils"
File renamed without changes.
@@ -1,25 +0,0 @@
-#!/usr/bin/osascript
-# This script is required to reorder the parameters sent by Git, so that they may be passed into the Merge Applescript API
-on run args
- tell application "Araxis Merge"
- set _file1 to item 2 of args as text
- set _file2 to item 5 of args as text
-
- if not _file1 starts with "/"
- set _file1 to (POSIX path of (POSIX file "." as alias)) & _file1
- end if
-
- if not _file2 starts with "/"
- set _file2 to (POSIX path of (POSIX file "." as alias)) & _file2
- end if
-
- set _document to compare {_file1, _file2}
-
- tell _document
- activate
- end tell
- repeat while exists _document
- delay 1
- end repeat
- end tell
-end run
@@ -1,27 +0,0 @@
-#!/usr/bin/osascript
-# This script is required by Git to launch Compare because Git expects a zero return code to indicate a successful merge, whereas Compare returns a non-zero number indicating the number of conflicts. This script always returns zero, unless Compare throws an error.
-on run args
- tell application "Araxis Merge"
- launch
- set _document to compare {item 1 of args, item 2 of args, item 3 of args}
-
- tell _document
- set the (first compared item's title) to "Remote"
- set the (second compared item's title) to "Base"
- set the (third compared item's title) to "Local: " & item 3 of args
-
- set the (first compared file's save path) to item 4 of args
- set the (second compared file's save path) to item 4 of args
- set the (third compared file's save path) to item 4 of args
- activate
- end tell
-
- try
- repeat while exists _document
- delay 1
- end repeat
- on error
- end try
-
- end tell
-end run
@@ -1,27 +0,0 @@
-#!/usr/bin/osascript
-# This script is required by Mercurial to launch Compare because Mercurial expects a zero return code to indicate a successful merge, whereas Compare returns a non-zero number indicating the number of conflicts. This script always returns zero, unless Compare throws an error.
-on run args
- tell application "Araxis Merge"
- launch
- set _document to compare {item 1 of args, item 2 of args, item 3 of args}
-
- tell _document
- set the (first compared item's title) to "Other"
- set the (second compared item's title) to "Base"
- set the (third compared item's title) to "Local: " & item 3 of args
-
- set the (first compared file's save path) to item 4 of args
- set the (second compared file's save path) to item 4 of args
- set the (third compared file's save path) to item 4 of args
- activate
- end tell
-
- try
- repeat while exists _document
- delay 1
- end repeat
- on error
- end try
-
- end tell
-end run
@@ -1,82 +0,0 @@
-#!/usr/bin/osascript
-# This script is required to reorder the parameters, so that they may be passed into the Merge Applescript API
-on run args
-
- # make sure that the correct number of arguments are passed in
- if (count of args) is not 2 and (count of args) is not 4 and (count of args) is not 6 then
- return (count of args as text) & " arguments given!" & Usage()
- end if
-
- tell application "Araxis Merge"
- set _file1 to item 1 of args as text
- set _file2 to item 2 of args as text
- set _ancestorFile to ""
- set _mergeFile to ""
-
- if count of args >= 4 then
- if item 3 of args is equal to "-ancestor"
- set _ancestorFile to item 4 of args as text
- else
- if item 3 of args is equal to "-merge"
- set _mergeFile to item 4 of args as text
- else
- return "Third argument must be '-merge' or '-ancestor'!"
- end if
- end if
- end if
-
- if count of args is 6 then
- if item 5 of args is equal to "-ancestor"
- if item 3 of args is equal to "-ancestor"
- return "There must be only one '-ancestor'! "
- end if
- set _ancestorFile to item 6 of args as text
- else
- if item 5 of args is equal to "-merge"
- if item 3 of args is equal to "-merge"
- return "There must be only one '-merge'! "
- end if
- set _mergeFile to item 6 of args as text
- else
- return "Fifth argument must be '-merge' or '-ancestor'!"
- end if
- end if
- end if
-
-
- if not _file1 starts with "/"
- set _file1 to (POSIX path of (POSIX file "." as alias)) & _file1
- end if
- if not _file2 starts with "/"
- set _file2 to (POSIX path of (POSIX file "." as alias)) & _file2
- end if
- if _ancestorFile is not equal to "" and not _ancestorFile starts with "/"
- set _ancestorFile to (POSIX path of (POSIX file "." as alias)) & _ancestorFile
- end if
- if _mergeFile is not equal to "" and not _mergeFile starts with "/"
- set _mergeFile to (POSIX path of (POSIX file "." as alias)) & _mergeFile
- end if
-
- if _ancestorFile is equal to "" then
- set _document to compare {_file1, _file2}
- else
- set _document to compare {_file1, _ancestorFile, _file2}
- end if
-
- tell _document
- if _mergeFile is not equal to ""
- set the (first compared file's save path) to _mergeFile
- set the (second compared file's save path) to _mergeFile
- if _ancestorFile is not equal to ""
- set the (third compared file's save path) to _mergeFile
- end if
- end if
- activate
- end tell
- end tell
-end run
-
-on Usage()
- return "
-Usage is: araxisopendiff <file1> <file2> [-ancestor <ancestorFile>] [-merge <mergeFile>] "
-end Usage
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,38 +0,0 @@
-#!/usr/bin/osascript
-# This script is required by Subversion to launch Compare because Subversion expects a zero return code to indicate a successful merge, whereas Compare returns a non-zero number indicating the number of conflicts. This script always returns zero, unless Compare throws an error.
-on run args
- tell application "Araxis Merge"
- launch
-
- # make any relative paths absolute
- set _remote to (POSIX path of ((item 2 of args as POSIX file) as alias))
- set _ancestor to (POSIX path of ((item 1 of args as POSIX file) as alias))
- set _local to (POSIX path of ((item 3 of args as POSIX file) as alias))
- set _merged_output to (POSIX path of ((item 4 of args as POSIX file) as alias))
-
- set _document to compare {_remote, _ancestor, _local}
-
- tell _document
- set the (first compared item's title) to "Theirs"
- set the (second compared item's title) to "Common ancestor"
- set the (third compared item's title) to "Yours: " & item 3 of args
-
- set the (first compared file's save path) to _merged_output
- set the (second compared file's save path) to _merged_output
- set the (third compared file's save path) to _merged_output
-
- merge into common ancestor
-
- activate
- end tell
-
- # wait until application exits
- try
- repeat while exists _document
- delay 1
- end repeat
- on error
- end try
-
- end tell
-end run
View
Binary file not shown.
View
Binary file not shown.
View
@@ -15,13 +15,17 @@
[core]
editor = mvim
excludesfile = /Users/robertorivera/.gitignore_global
-[merge]
- tool = araxis
+[difftool "kdiff3"]
+ path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+ trustExitCode = false
+[difftool]
+ prompt = false
[diff]
- tool = araxis
-[difftool "sourcetree"]
- cmd = opendiff \"$LOCAL\" \"$REMOTE\"
- path =
-[mergetool "sourcetree"]
- cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
- trustExitCode = true
+ tool = kdiff3
+[mergetool "kdiff3"]
+ path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+ trustExitCode = false
+[mergetool]
+ keepBackup = false
+[merge]
+ tool = kdiff3
View
@@ -1,8 +1,8 @@
set background=dark
-colorscheme Tomorrow-Night
+colorscheme Hemisu
set guioptions=aAce
syntax enable
-set transparency=7
+set transparency=10
"set guifont=Menlo\ bold:h12
set guifont=Menlo:h14

0 comments on commit 7504e6a

Please sign in to comment.