| author | Junio C Hamano <redacted> | |
| Tue, 17 May 2016 21:38:39 +0000 (14:38 -0700) | ||
| committer | Junio C Hamano <redacted> | |
| Tue, 17 May 2016 21:38:39 +0000 (14:38 -0700) | ||
| commit | be6ec17822e523ef4700c612f1ec2baedacd1227 | |
| tree | 6606e98fc8a60309c004170a9356f1f9da39d16b | tree | snapshot |
| parent | bfc99b63fe859e16ddcfcbe6ac09f98b8d06b34e | commit | diff |
| parent | 05a5869a01779e6fb55535aff9b01716aac42dcf | commit | diff |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |