summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:45 -0700
commit6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08 (patch)
treebc3d2b2c238b57f89df7b8483e9fa5e369513a8e /git-rebase.sh
parent520cd9cd20a97d1220d6f0ebf921406683ad62ee (diff)
parentde3d8bb7736cafae0ff10e047e2afa994b1dd901 (diff)
downloadgit-6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08.tar.gz
Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions