git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-07-11 10:13:19 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
fc4263ce4b6a613622dbe985a8e6aca015789cf1
git/git-resolve-script
Linus Torvalds 55a716cc8c Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. 
Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
2005-06-19 19:42:21 -07:00

1.7 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink