summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-04-23 14:27:47 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-23 11:28:24 -0700
commit64f7a26494f955f56510d82ba7f07fa8b85a2317 (patch)
treeceaff1cf5d02726ea9b6441919b83010a778e13f /builtin/merge-ours.c
parentconfig.txt: update versioncmp.prereleaseSuffix (diff)
downloadtgif-64f7a26494f955f56510d82ba7f07fa8b85a2317.tar.xz
git tag: mention versionsort.prereleaseSuffix in manpage
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions