diff options
| author |  Deskin Miler <deskinm@umich.edu> | 2008-09-18 17:55:14 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-21 23:51:12 -0700 |
| commit | 9747deb7e1dc7dae7f772a418feafa08c2d18e9f (patch) | |
| tree | 303855803028867c6727c2a69224e39fe4727ecc /git-merge-resolve.sh | |
| parent | Merge branch 'db/maint-checkout-b' (diff) | |
| download | tgif-9747deb7e1dc7dae7f772a418feafa08c2d18e9f.tar.xz | |
git-svn: testcase for partial rebuild
[jc: use expect_failure to mark the test to expose existing breakage]
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions