Tree
- Tree:
e3d9f3b685f1322132cd19702b39a3a13300bd5d
- Date:
- Message:
- show merged commit ID + logmsg upon merge conflict during rebase and histedit This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue
Makefile | commits | blame |
git-repository.5 | commits | blame |
got-worktree.5 | commits | blame |
got.1 | commits | blame |
got.c | commits | blame |