diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:01 -0800 |
| commit | 1067f8dd0eef81062f740ba4bc680ac9649a0d42 (patch) | |
| tree | 345dd16fb46de3db319cae484e2c2bf4bdca25c1 /t/t5515/fetch.br-config-explicit-merge | |
| parent | Merge branch 'pw/p4-view-updates' (diff) | |
| parent | write first for-merge ref to FETCH_HEAD first (diff) | |
| download | tgif-1067f8dd0eef81062f740ba4bc680ac9649a0d42.tar.xz | |
Merge branch 'jh/fetch-head-update'
* jh/fetch-head-update:
write first for-merge ref to FETCH_HEAD first
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
| -rw-r--r-- | t/t5515/fetch.br-config-explicit-merge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5515/fetch.br-config-explicit-merge b/t/t5515/fetch.br-config-explicit-merge index f6475b717a..5ce764a06e 100644 --- a/t/t5515/fetch.br-config-explicit-merge +++ b/t/t5515/fetch.br-config-explicit-merge @@ -1,8 +1,8 @@ # br-config-explicit-merge +0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../ -0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../ 6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ |