![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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 | ba0ac36ec5708820e670731001f7ab35351c6c48 | |
| tree | 67829a9b6a4f9380f6542b3d77e72a40abb8a090 | tree | snapshot |
| parent | 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 | commit | diff |
merge and resolve: Output short hashes and .. in "Updating ..."
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diff | blob | history | |
| git-resolve.sh | diff | blob | history |