Adding splice as merge tool
authorStefan Huber <shuber2@gmx.at>
Wed, 7 Nov 2012 21:26:02 +0000 (22:26 +0100)
committerStefan Huber <shuber2@gmx.at>
Wed, 7 Nov 2012 21:26:02 +0000 (22:26 +0100)
commit252585f90d9efec77b1bd5602ff98e19b86d87e4
treeed7a552796f4039988db52d8bd15d83c6eea181d
parent90c0e76b6b0f0eb20a9a9e97c0ca6ba5fcd7b5d1
Adding splice as merge tool
dotfiles/gitconfig
dotfiles/hg/hgrc