| author | Junio C Hamano <junkio@cox.net> |
|---|---|
| Wed, 2 Nov 2005 03:34:49 +0000 (19:34 -0800) | |
| committer | Junio C Hamano <junkio@cox.net> |
| Thu, 3 Nov 2005 22:55:10 +0000 (14:55 -0800) | |
| commit | 64da9e6...4eea25c9c20cfe12618285ccd0bf3cfe |
| tree | 520ffc1...b69b8bf3993f49c2d91685820e96b85d (tree) |
| parent | 123ee3c...7b57c32bb3ecd8cfede20dbb9dd5a8a8 (diff) |
| .gitignore | diff | blob | history | |
| Makefile | diff | blob | history | |
| git-merge-ours.sh | [new file with mode: 0755] | blob |
| git-merge.sh | diff | blob | history |