| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Sun, 2 Jun 2013 22:48:22 +0000 (15:48 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Sun, 2 Jun 2013 22:48:22 +0000 (15:48 -0700) | |
| commit | 499eace...217df573fb3698d7a52e3e5a9b4173bc |
| tree | 4b09c67...8ed4eb6a51e5a3a41db35a1c964ed475 (tree) |
| parent | 7abc6b7...5148118518a6fbdcef82b3e0dabbaa17 (diff) |
| parent | 66fa1b2...354f79ed48f5986ee700ccb2d167ccbf (diff) |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |