![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Fri, 11 Nov 2005 23:53:07 +0000 (00:53 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 12 Nov 2005 05:14:34 +0000 (21:14 -0800) | ||
| commit | 46e651743ae5c0938c4ff076a0453ecc9611a520 | |
| tree | 929760cb940645848f4d0415aa5029c37ab6f9eb | tree | snapshot |
| parent | 5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 | commit | diff |
merge-recursive: Indent the output properly
If we have multiple common ancestors and have to recursively merge
them then the output will be much more readable with this commit.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
If we have multiple common ancestors and have to recursively merge
them then the output will be much more readable with this commit.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diff | blob | history |