summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Alex Henrie <alexhenrie24@gmail.com>2015-08-26 22:26:02 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-28 09:42:13 -0700
commit99885bc0ef0013a8979ad8cefe56360e69791811 (patch)
tree7e7230fbfbd1621cf6be110427e1b6f16fd8a4b5 /contrib/examples/git-merge-ours.sh
parentdate.c: add parse_expiry_date() (diff)
downloadtgif-99885bc0ef0013a8979ad8cefe56360e69791811.tar.xz
reflog: add missing single quote to error message
The error message can be seen by running `git config gc.reflogexpire foo` and then `git reflog expire`. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions