| author | Vasco Almeida <vascomalmeida@sapo.pt> |
|---|---|
| Fri, 17 Jun 2016 20:21:18 +0000 (20:21 +0000) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 17 Jun 2016 22:46:10 +0000 (15:46 -0700) | |
| commit | c8bb9d2...5a0926c29849091b86fa025da87b68f3 |
| tree | c4c185e...5d53b3e1d79cd74d2b2501f7c30c6e27 (tree) |
| parent | bef4830...88008adf488d190c742e243cacc46e16 (diff) |
| builtin/merge.c | diff | blob | history |