summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2015-08-26 04:51:00 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 12:16:56 -0700
commit6262fe9ca3cd61d27ca5c5599ab46d166e5b23a2 (patch)
tree0f2b40dc19fb59d49e3369327957869f81dabd97 /t/t6037-merge-ours-theirs.sh
parenttrailer: ignore first line of message (diff)
downloadtgif-6262fe9ca3cd61d27ca5c5599ab46d166e5b23a2.tar.xz
trailer: retitle a test and correct an in-comment message
Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions