Age | Commit message (Expand) | Author |
---|---|---|
2014-07-14 | FastForward merge should block if there are checkout conflicts. | Jameson Miller |
2014-06-18 | Introduce merge.ff configuration handling | Edward Thomson |
2014-05-03 | Update Checkout and Merge options | Jameson Miller |
2014-04-16 | Fix some issues pinpointed by Code Analysis | nulltoken |
2014-04-09 | Introduce new merge functionality, including Pull, merge options, and | Jameson Miller |