git4idea: Made merge provider to use MergeProvider2, refactored some utlities that...
commitd8501cb998b992a1d30738f4b5b0a2e4b143380f
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 13 Jan 2009 15:47:18 +0000 (13 18:47 +0300)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Tue, 13 Jan 2009 15:47:18 +0000 (13 18:47 +0300)
tree47f5e471ad37da1ff1ee79f740233903663c0fa8
parent4ab7cdb6e39a41151bf61fd5904b6310ce32d749
git4idea: Made merge provider to use MergeProvider2, refactored some utlities that works with files on the git.
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/actions/GitAdd.java
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
plugins/git4idea/src/git4idea/commands/GitFileUtils.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
plugins/git4idea/src/git4idea/vfs/GitVFSListener.java