| author | Vasco Almeida <vascomalmeida@sapo.pt> |
|---|---|
| Thu, 15 Sep 2016 14:59:02 +0000 (14:59 +0000) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 15 Sep 2016 20:17:32 +0000 (13:17 -0700) | |
| commit | 765773c...397800218e7389fd3e9431cfbfdb6ad1 |
| tree | fe3d26f...90a95eb927d514acb56b31c43370eb65 (tree) |
| parent | ccf7813...39f0cb8800b0490d572a22c864a2f0f6 (diff) |
| builtin/merge-recursive.c | diff | blob | history |