ConflictResolvedAction: Move unimplemented GitCommand.deleteConflictFile
treed73347a8d1ca7ce2eb2267373cf2c5e800d976e4
-rw-r--r-- 17 .gitattributes
-rw-r--r-- 28 .gitignore
-rw-r--r-- 174 CONTRIBUTORS
-rw-r--r-- 36571 LICENSE
-rw-r--r-- 69 README
-rw-r--r-- 2156 README.markdown
-rw-r--r-- 473 build.xml
drwxr-xr-x - javahelp
-rw-r--r-- 260 manifest.mf
drwxr-xr-x - misc
drwxr-xr-x - nbproject
drwxr-xr-x - release
drwxr-xr-x - src
drwxr-xr-x - test