![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Fri, 22 Dec 2006 02:20:55 +0000 (03:20 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 22 Dec 2006 04:33:06 +0000 (20:33 -0800) | ||
| commit | caba139d432c420f853c352987cf29cefafc2b84 | |
| tree | 1ab9894fc65dfd5b44679d0c8c2207d10b4abc50 | tree | snapshot |
| parent | 7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad | commit | diff |
Use git-merge-file in git-merge-one-file, too
Would you believe? I edited git-merge-one-file (note the missing ".sh"!)
when I submitted the patch which became commit e2b7008752...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Would you believe? I edited git-merge-one-file (note the missing ".sh"!)
when I submitted the patch which became commit e2b7008752...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-one-file.sh | diff | blob | history |