author | Vasco Almeida <vascomalmeida@sapo.pt> | |
Mon, 19 Sep 2016 13:08:20 +0000 (13:08 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 21 Sep 2016 17:20:43 +0000 (10:20 -0700) | ||
commit | c041c6d06a7fce3aa563d7b0c4a47feccc541400 | |
tree | 8050a5106689367cedd8d2e08d45378de96c3962 | tree | snapshot |
parent | 166e55e328a5b303031140f758a0463df331777a | commit | diff |
notes-merge.c | diff | blob | history | |
t/t3310-notes-merge-manual-resolve.sh | diff | blob | history |