diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-12-03 11:40:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-03 12:28:52 -0800 |
| commit | 4275df517022604f5c33ba05ae45a885b84e3472 (patch) | |
| tree | 08dc35c3961c38ac1522b6ec2e7d7ff803291e50 /t | |
| parent | 56b5e946f2ba4fd57bbe14f9e3ec2e0ae314d5e6 (diff) | |
| download | git-4275df517022604f5c33ba05ae45a885b84e3472.tar.gz git-4275df517022604f5c33ba05ae45a885b84e3472.tar.xz | |
git-merge: Exit with code 2 if no strategy was able to handle the merge.
This way it is possible to test in scripts if the merge was non-clean
or if the strategy had other problems with the merge.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions