diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
| commit | 152a9c17a802379a3a48e025b74dedd76e2623cc (patch) | |
| tree | 35adf01f3da51119a475392076d1cb290b800a00 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff) | |
| parent | abf03eeb8e99538cd31806d5f252214b9fe695a6 (diff) | |
| download | git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.gz | |
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates.
* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index f524d2f383..d33d714006 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' ' echo friend > README && cat tmp >> README && git commit -a -m "friend" && - git pull . merge + git merge merge ' test_debug 'gitk --all & sleep 1' |