| author | W. Trevor King <redacted> | |
| Thu, 12 Oct 2017 09:02:17 +0000 (02:02 -0700) | ||
| committer | Junio C Hamano <redacted> | |
| Thu, 12 Oct 2017 12:14:23 +0000 (21:14 +0900) | ||
| commit | 488aa65c8fdad35869d7ac47180ad1688262788f | |
| tree | 58802166205aef0501acfefc4f9a4ff806f42b0c | tree | snapshot |
| parent | 4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 | commit | diff |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-options.txt | diff | blob | history |