![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Dec 2006 10:10:55 +0000 (02:10 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Dec 2006 10:10:55 +0000 (02:10 -0800) | ||
| commit | 9def2138a17325c68961c3b1e6c967d33f28a4f1 | |
| tree | ace1cf9adca0334eade813cd1b41acf8422f7efc | tree | snapshot |
| parent | 9e83266525aad5c6210b9a21be9b1c6996d5544f | commit | diff |
| parent | 658f3650273abd6888c964b9fb1291c603306df8 | commit | diff |
Merge branch 'js/rerere'
* js/rerere:
Make git-rerere a builtin
Add a test for git-rerere
move read_mmfile() into xdiff-interface
* js/rerere:
Make git-rerere a builtin
Add a test for git-rerere
move read_mmfile() into xdiff-interface
| Makefile | diff1 | | diff2 | | blob | history |
| git.c | diff1 | | diff2 | | blob | history |