diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-25 14:48:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-25 23:08:53 (GMT) |
| commit | 0bed18998ae6c0cec1485e6295be16a4fcebc7a7 (patch) | |
| tree | 976e661a6944005201b73ec14424a69fbeaff3d2 /git-merge.sh | |
| parent | 946f5f7c245a0f9398417be5946795cfebfd1c62 (diff) | |
| download | git-0bed18998ae6c0cec1485e6295be16a4fcebc7a7.zip git-0bed18998ae6c0cec1485e6295be16a4fcebc7a7.tar.gz git-0bed18998ae6c0cec1485e6295be16a4fcebc7a7.tar.bz2 | |
[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.
If the working tree is dirty read-tree will fail, and we don't want an
ugly stack trace in that case. Also make sure we don't print stack
traces when we use 'die'.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions