projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87b5054 86273e5)
Merge branch 'en/rename-d-f' into en/merge-recursive
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:25:28 +0000 (17:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:25:28 +0000 (17:25 -0700)
commita1155adc2dde23fd664ad47399379cd0561762af
treed7cc6994bc7f98b40e65d854af67f460d4e94ec3tree | snapshot
parent87b50542a08ac6caa083ddc376e674424e37940acommit | diff
parent86273e5764ab7faaa84c3de1a428ed24a6cfdf1fcommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
Git—the stupid content tracker