| author | Santi Béjar <sbejar@gmail.com> |
|---|---|
| Sun, 1 Oct 2006 03:34:17 +0000 (05:34 +0200) | |
| committer | Junio C Hamano <junkio@cox.net> |
| Sun, 1 Oct 2006 05:13:28 +0000 (22:13 -0700) | |
| commit | ba0ac36...c5708820e670731001f7ab35351c6c48 |
| tree | 67829a9...6a4f9380f6542b3d77e72a40abb8a090 (tree) |
| parent | 20a3847...8a5032ce41f90dcc68abfb36e6fee9b1 (diff) |
| git-merge.sh | diff | blob | history | |
| git-resolve.sh | diff | blob | history |