summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2019-04-17 15:30:38 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-19 17:32:10 +0900
commitc44c24621da1cf45e2525b42d90982c78bffc207 (patch)
treed9f984d3a425399b0caedce84aae154e3b0567e9 /t/t7605-merge-resolve.sh
parentrebase -i: combine rebase--interactive.c with rebase.c (diff)
downloadtgif-c44c24621da1cf45e2525b42d90982c78bffc207.tar.xz
rebase -i: remove duplication
path_state_dir() and merge_dir() refer to the same path so remove one of them. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions