aboutsummaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-04 09:29:15 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-04 09:29:15 -0700
commit62ebe03b9e8d5a6a37ea2b726d64b109aec0508c (patch)
treebd6707b53735700502512a4f78dd28ca06706321 /git-merge-resolve.sh
parentMerge branch 'as/diff-options-grammofix' (diff)
parentdoc: remove unsupported parameter from patch-id (diff)
downloadgit-62ebe03b9e8d5a6a37ea2b726d64b109aec0508c.tar.gz
git-62ebe03b9e8d5a6a37ea2b726d64b109aec0508c.zip
Merge branch 'ah/patch-id-doc'
Docfix. * ah/patch-id-doc: doc: remove unsupported parameter from patch-id
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions