![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 31 Jul 2006 10:42:35 +0000 (12:42 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 31 Jul 2006 22:41:12 +0000 (15:41 -0700) | ||
| commit | c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246 | |
| tree | 1e328dc91018d6d3a729728be8925b1b037524eb | tree | snapshot |
| parent | 7a85b848ad77c72c539c5887ead99a89140541da | commit | diff |
merge-recur: virtual commits shall never be parsed
It would not make sense to parse a virtual commit, therefore set the
"parsed" flag to 1.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
It would not make sense to parse a virtual commit, therefore set the
"parsed" flag to 1.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diff | blob | history |