mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fix-diff-files-unmerged' into maint

Browse Source 
* jc/fix-diff-files-unmerged:
  diff-files: show unmerged entries correctly
  diff: remove often unused parameters from diff_unmerge()
  diff.c: return filepair from diff_unmerge()
  test: use $_z40 from test-lib
This commit is contained in:
Junio C Hamano
2011-05-13 10:41:54 -07:00
parent 4bdbfb15b2 095ce9538b
commit a613b534bc
16 changed files with 120 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
t/t4027-diff-submodule.sh
View File

@ -5,7 +5,6 @@ test_description='difference in submodules'
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh
_z40=0000000000000000000000000000000000000000
test_expect_success setup '
test_tick &&
test_create_repo sub &&