| commit | 0bed18998ae6c0cec1485e6295be16a4fcebc7a7 | |
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Sun, 25 Sep 2005 14:48:24 +0000 (25 16:48 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Sep 2005 23:08:53 +0000 (25 16:08 -0700) | ||
| tree | 976e661a6944005201b73ec14424a69fbeaff3d2 | treesnapshot (tar.gz zip) |
| parent | 946f5f7c245a0f9398417be5946795cfebfd1c62 | commitdiff |
[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>
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>
| git-merge-recursive.py | diffblobblamehistory |