diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-11 07:23:14 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 10:46:47 -0700 |
| commit | 2594a79ea9d34053384d514afd5dcaaaeed15480 (patch) | |
| tree | 1adea4e7104239982b31825c51a5d21f8309620d /git-gui/lib/merge.tcl | |
| parent | 2e8e813232d33bb7454cc56edb4b5336b7c89ccd (diff) | |
remote-hg: fix bad state issue
The problem reportedly happened after doing a push that fails, the abort
causes the state of remote-hg to go bad, this happens because
remote-hg's marks are not stored, but 'git fast-export' marks are.
Ensure that the marks are _always_ stored.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions