summaryrefslogtreecommitdiff
path: root/git-gui/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 17:25:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 17:25:28 -0700
commita1155adc2dde23fd664ad47399379cd0561762af (patch)
treed7cc6994bc7f98b40e65d854af67f460d4e94ec3 /git-gui/GIT-VERSION-GEN
parentGit 1.7.3 (diff)
parentmerge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (diff)
downloadtgif-a1155adc2dde23fd664ad47399379cd0561762af.tar.xz
Merge branch 'en/rename-d-f' into en/merge-recursive
* en/rename-d-f: merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir t3509: Add rename + D/F conflict testcase that recursive strategy fails
Diffstat (limited to 'git-gui/GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions