| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 25 Jun 2015 18:02:16 +0000 (11:02 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 25 Jun 2015 18:02:17 +0000 (11:02 -0700) | |
| commit | ebf4fc9...da239f1005d2c5b1a4278cfe51430151 |
| tree | fbbf73c...7da9cda04725eb7f5b21432db8622b93 (tree) |
| parent | 5fd7227...d468ecf6b5685dbff14e8a4b2de8eb77 (diff) |
| parent | fc0aa39...f3205a049e917d391e2afa93cda0c8af (diff) |
| Documentation/merge-config.txt | diff1 | | diff2 | | blob | history |