diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:02:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:02:11 -0700 |
| commit | faae8854bfb18da013e0a41d061dbbe73b3c9c73 (patch) | |
| tree | 9c218a3393ff101e71c4de6f5b61250eb89c67ce /git-merge-resolve.sh | |
| parent | Merge branch 'js/fast-export-paths-with-spaces' (diff) | |
| parent | git p4 test: fix badp4dir test (diff) | |
| download | tgif-faae8854bfb18da013e0a41d061dbbe73b3c9c73.tar.xz | |
Merge branch 'pw/git-p4-tests'
More "git p4" tests.
* pw/git-p4-tests:
git p4 test: fix badp4dir test
git p4 test: split up big t9800 test
git p4 test: cleanup_git should make a new $git
git p4 test: copy source indeterminate
git p4 test: check for error message in failed test
git p4 test: rename some "git-p4 command" strings
git p4 test: never create default test repo
git p4 test: simplify quoting involving TRASH_DIRECTORY
git p4 test: use real_path to resolve p4 client symlinks
git p4 test: wait longer for p4d to start and test its pid
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions