| author | Lars Hjemli <hjemli@gmail.com> |
|---|---|
| Sun, 23 Sep 2007 22:51:44 +0000 (00:51 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700) | |
| commit | d08af0a...745869a4fe36bc8df4f9804edfb74eb9 |
| tree | e12eb7e...ce147d4f4c386a8da97c3748950c84ca (tree) |
| parent | aec7b36...ad07e1a2c58051c8db653dabffee8960 (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| git-merge.sh | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |