diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:19:23 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:19:23 -0700 |
| commit | 76c3fb1f844753c4186975a483943e1970b3c4e2 (patch) | |
| tree | 3c454310228d1c2500fbb38c5b78eb473766680a /t | |
| parent | c9618ff939aeb5e895d90c2478db989038eccc26 (diff) | |
| parent | 668f26fff610605d112fbedffae79917de948893 (diff) | |
| download | git-76c3fb1f844753c4186975a483943e1970b3c4e2.tar.gz git-76c3fb1f844753c4186975a483943e1970b3c4e2.tar.xz | |
Merge branch 'mv/merge-refresh'
* mv/merge-refresh:
builtin-merge: refresh the index before calling a strategy
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 9516f541e..7313ac278 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -511,4 +511,13 @@ test_expect_success 'in-index merge' ' test_debug 'gitk --all' +test_expect_success 'refresh the index before merging' ' + git reset --hard c1 && + sleep 1 && + touch file && + git merge c3 +' + +test_debug 'gitk --all' + test_done |