]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d4dc66 8c3419b)
Merge branch 'sb/t6031-typofix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
* sb/t6031-typofix:
  t6031-test-merge-recursive: do not forget to add file to be committed

1  2 
t/t6031-merge-recursive.sh patch | diff1 | diff2 | blob | history

diff --cc t/t6031-merge-recursive.sh
Simple merge
Git mirror and local development