When I get a merge conflict, I do:
:Gvdiffsplit!
which opens a three-way diff to allow me to choose between "ours" and "theirs" for each chunk.
Once I've done whatever I need to do, how do I close this view and return to just viewing the file?
Return from Gdiffsplit! three-way view
1.8k Views Asked by LondonRob At
0
There are 0 best solutions below
Related Questions in VIM
- Google Now Event Reservation showing differently on iOS and Android
- Gmail Action Schema changes
- Coding an email that Siri and Google Now will pick up Schema.org markup from?
- Google now card does not display
- Self test is not working for me
- Email markup-Gmail modifying the <script> tag to add extra string "3D"
- How to display review star ratings in google search results
- Event description in JSON-LD does not appear to be interpreted in Gmail
- Automatically create calendar event from gmail
- what is the correct use of schema.org imageGallery
Related Questions in VIM-FUGITIVE
- Google Now Event Reservation showing differently on iOS and Android
- Gmail Action Schema changes
- Coding an email that Siri and Google Now will pick up Schema.org markup from?
- Google now card does not display
- Self test is not working for me
- Email markup-Gmail modifying the <script> tag to add extra string "3D"
- How to display review star ratings in google search results
- Event description in JSON-LD does not appear to be interpreted in Gmail
- Automatically create calendar event from gmail
- what is the correct use of schema.org imageGallery
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?