From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sat, 26 Nov 2011 22:32:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'Dieter_be/master'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/4b21d241422c84a3cd54cdd19e59c5110c2908f2?ds=sidebyside;hp=-c

Merge remote-tracking branch 'Dieter_be/master'

Conflicts:
	doc/error_codes.md
---

4b21d241422c84a3cd54cdd19e59c5110c2908f2
diff --combined doc/error_codes.md
index 008d4a1,a6cc903..e127e7d
--- a/doc/error_codes.md
+++ b/doc/error_codes.md
@@@ -4,6 -4,8 +4,6 @@@
  * 11: Could not enter $GIT_WORK_TREE
  * 12: No repository found
  * 13: Required directory exists but is not a directory
 -* 14: Could not create directory
 -* 15: Could not create file
  * 16: Potentially harmful operation aborted
  * 17: Files that would be overwritten exist; fix manually
  
@@@ -11,11 -13,3 +11,9 @@@
  * 51: Could not create file
  * 52: Could not move directory
  * 53: Could not move file
 +* 54: Directory exists
 +* 55: File exists
 +* 56: 
 +* 57: Could not write to file
 +* 57: Could not delete directory
 +* 59: Could not delete file
- 
- * 99: Error code reserved for actions that should never happen