| author | Lars Hjemli <hjemli@gmail.com> |
|---|---|
| Sun, 23 Sep 2007 22:51:43 +0000 (00:51 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700) | |
| commit | aec7b36...ad07e1a2c58051c8db653dabffee8960 |
| tree | 2c1a532...238be00cbccc71c32e8ab50483a4a3d2 (tree) |
| parent | d38eb71...d92864b0b1f7cd36f17e273e3d8c735c (diff) |
| Documentation/config.txt | diff | blob | history | |
| Documentation/git-merge.txt | diff | blob | history | |
| git-merge.sh | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |