| author | Björn Gustavsson <bgustavsson@gmail.com> |
|---|---|
| Thu, 29 Oct 2009 22:08:31 +0000 (23:08 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 30 Oct 2009 23:02:26 +0000 (16:02 -0700) | |
| commit | 1347483...3b2a71a34f899c9b1326ccf7ae082412 |
| tree | aecf089...81630334a9306a734af1c126195e56f2 (tree) |
| parent | cd0f8e6...63d3e2744d7d3b2329238be7d064a8ea (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin-merge.c | diff | blob | history | |
| git-pull.sh | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |