summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2013-07-17 21:54:25 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-17 17:55:05 -0700
commit76053e77efb3097cfb4cdaf2eb76ce4ee65ff58b (patch)
tree904031f15fd3f64213b5f7b92ccff597b906c790 /git-merge-resolve.sh
parentUpdate draft release notes to 1.8.4 (diff)
downloadtgif-76053e77efb3097cfb4cdaf2eb76ce4ee65ff58b.tar.xz
.mailmap: René Scharfe has a new email address
Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions