diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-11-12 00:53:07 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 21:14:34 -0800 |
| commit | 46e651743ae5c0938c4ff076a0453ecc9611a520 (patch) | |
| tree | 929760cb940645848f4d0415aa5029c37ab6f9eb /gitMergeCommon.py | |
| parent | 5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 (diff) | |
| download | git-46e651743ae5c0938c4ff076a0453ecc9611a520.tar.gz git-46e651743ae5c0938c4ff076a0453ecc9611a520.tar.xz | |
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>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions